Changeset 9078 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Apr 28, 2005, 5:22:55 PM (20 years ago)

Author:

darin

Message:

Reviewed by Dave Harrison.

• fixed problems preventing us from compiling with gcc 4.0

• JavaScriptCore.pbproj/project.pbxproj: Removed -Wmissing-prototypes from WARNING_CPLUSPLUSFLAGS since it's now a C-only warning.

• bindings/jni/jni_jsobject.cpp: (JSObject::getSlot): Changed some %d to %ld where the parameters where long ints. (JSObject::setSlot): Ditto.
• bindings/jni/jni_utility.cpp: (KJS::Bindings::getJavaVM): Ditto. (KJS::Bindings::getJNIEnv): Ditto.
• bindings/objc/objc_utility.mm: Fixed include of <JavascriptCore/internal.h> that needed the letter "S" capitalized.
• kjs/bool_object.cpp: (BooleanProtoFuncImp::call): Rearranged how this function returns to avoid incorrect gcc 4.0 warning.
• kjs/collector.cpp: (KJS::Collector::markStackObjectsConservatively): Changed code to check the alignment of the passed-in pointers to only require pointer-level alignment, not 8-byte alignment. Prevents a crash on garbage collect when compiled with gcc 4.0.
• kjs/nodes.cpp: (WhileNode::execute): Added a redundant return after an infinite loop to work around incorrect gcc 4.0 warning. (ForNode::execute): Ditto. (SwitchNode::execute):Rearranged how this function returns to avoid incorrect gcc 4.0 warning. (LabelNode::execute): Ditto.
• kjs/string_object.cpp: (replace): Ditto.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1933 +1933 @@
       return c;
   }
+
+  return Completion(); // work around gcc 4.0 bug
 }
 
@@ -2001 +2003 @@
     }
   }
+  
+  return Completion(); // work around gcc 4.0 bug
 }
 
@@ -2458 +2462 @@
   if ((res.complType() == Break) && ls.contains(res.target()))
     return Completion(Normal, res.value());
-  else
-    return res;
+  return res;
 }
 
@@ -2497 +2500 @@
   if ((e.complType() == Break) && (e.target() == label))
     return Completion(Normal, e.value());
-  else
-    return e;
+  return e;
 }