From f3e3c1b6606f78e22f5c8545522ad0c661140b75 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Fri, 15 Apr 2011 23:27:59 +0000
Subject: [PATCH] bug fixes

---
 Robust/src/IR/Flat/BuildCode.java | 2 +-
 Robust/src/Runtime/garbage.c      | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 367d9a83..fb4c65fd 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1994,7 +1994,7 @@ public class BuildCode {
       }
     }
 
-    if(fm.getMethod().isStaticBlock()) {
+    if(fm.getMethod()!=null&&fm.getMethod().isStaticBlock()) {
       // a static block, check if it has been executed
       output.println("  if(global_defsprim_p->" + cn.getSafeSymbol()+"static_block_exe_flag != 0) {");
       output.println("    return;");
diff --git a/Robust/src/Runtime/garbage.c b/Robust/src/Runtime/garbage.c
index 3b995eae..fcdfcc10 100644
--- a/Robust/src/Runtime/garbage.c
+++ b/Robust/src/Runtime/garbage.c
@@ -378,9 +378,6 @@ void searchglobalroots() {
 #endif
 }
 
-
-
-
 void searchstack(struct garbagelist *stackptr) {
   while(stackptr!=NULL) {
     int i;
@@ -406,7 +403,6 @@ void searchjnitable(struct jnireferences *jniptr) {
 }
 #endif
 
-
 #if defined(THREADS)||defined(DSTM)||defined(STM)||defined(MLP)
 void searchthreadroots(struct garbagelist * stackptr) {
   /* Check current stack */
@@ -455,14 +451,12 @@ void searchthreadroots(struct garbagelist * stackptr) {
 }
 #endif
 
-
 void searchroots(struct garbagelist * stackptr) {
 #if defined(THREADS)||defined(DSTM)||defined(STM)||defined(MLP)
   searchthreadroots(stackptr);
 #else
   searchstack(stackptr);
 #endif
-
 #ifdef FASTCHECK
   ENQUEUE(___fcrevert___, ___fcrevert___);
 #endif
@@ -475,7 +469,6 @@ void searchroots(struct garbagelist * stackptr) {
 #endif
 }
 
-
 void collect(struct garbagelist * stackptr) {
   doinitstuff();
 
@@ -555,7 +548,6 @@ void collect(struct garbagelist * stackptr) {
 #endif
 }
 
-
 void * tomalloc(int size) {
   void * ptr=to_heapptr;
   if ((size&7)!=0)
-- 
2.34.1