diff --git a/mozilla/js/js2/icodegenerator.cpp b/mozilla/js/js2/icodegenerator.cpp
index 8807b3d6010..f42ed3fdb67 100644
--- a/mozilla/js/js2/icodegenerator.cpp
+++ b/mozilla/js/js2/icodegenerator.cpp
@@ -1400,7 +1400,8 @@ TypedRegister ICodeGenerator::genStmt(StmtNode *p, LabelSet *currentLabelSet)
                     s = s->next;
                 }
                 // FIXME:  what about static member initialization? that's what mcg should be collecting.
-                thisClass->setConstructor(ccg.complete());
+                if (ccg.get_iCode()->size())
+                    thisClass->setConstructor(ccg.complete());
             }
         }
         break;
diff --git a/mozilla/js2/src/icodegenerator.cpp b/mozilla/js2/src/icodegenerator.cpp
index 8807b3d6010..f42ed3fdb67 100644
--- a/mozilla/js2/src/icodegenerator.cpp
+++ b/mozilla/js2/src/icodegenerator.cpp
@@ -1400,7 +1400,8 @@ TypedRegister ICodeGenerator::genStmt(StmtNode *p, LabelSet *currentLabelSet)
                     s = s->next;
                 }
                 // FIXME:  what about static member initialization? that's what mcg should be collecting.
-                thisClass->setConstructor(ccg.complete());
+                if (ccg.get_iCode()->size())
+                    thisClass->setConstructor(ccg.complete());
             }
         }
         break;