Changeset 15583 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 23, 2006, 2:59:00 PM (19 years ago)

Author:

ggaren

Message:

2006-07-23 Geoffrey Garen <​[email protected]>

Patch by Eric Albert, reviewed by Darin and me.

• Fixed <rdar://problem/4645931> JavaScriptCore stack-scanning code crashes (Collector::markStackObjectsConservatively)

• bindings/jni/jni_jsobject.cpp: On 64bit systems, jint is a long, not an int. (JavaJSObject::getSlot): (JavaJSObject::setSlot):
• kjs/collector.cpp: (KJS::Collector::markCurrentThreadConservatively): Use a pointer instead of an int as 'dummy,' because on LP64 systems, an int is not pointer-aligned, and we want to scan the stack for pointers.
• JavaScriptCore.xcodeproj/project.pbxproj: After a tense cease-fire, the XCode war has started up again!

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (1 diff)
• bindings/jni/jni_jsobject.cpp (modified) (2 diffs)
• kjs/collector.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+    2006-07-23  Geoffrey Garen  <[email protected]>
+
+        Patch by Eric Albert, reviewed by Darin and me.
+        
+        - Fixed <rdar://problem/4645931> JavaScriptCore stack-scanning code 
+        crashes (Collector::markStackObjectsConservatively)
+        
+        * bindings/jni/jni_jsobject.cpp: On 64bit systems, jint is a long, not an
+        int.
+        (JavaJSObject::getSlot):
+        (JavaJSObject::setSlot):
+        * kjs/collector.cpp:
+        (KJS::Collector::markCurrentThreadConservatively): Use a pointer instead of
+        an int as 'dummy,' because on LP64 systems, an int is not pointer-aligned,
+        and we want to scan the stack for pointers.
+        * JavaScriptCore.xcodeproj/project.pbxproj: After a tense cease-fire, the 
+        XCode war has started up again!
+
 === Safari-521.20 ===
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1216 +1216 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
+                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;
                         productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                         projectDirPath = "";
+                        projectRoot = "";
+                        shouldCheckCompatibility = 1;
                         targets = (
                                 932F5B3E0822A1C700736975 /* JavaScriptCore */,

trunk/JavaScriptCore/bindings/jni/jni_jsobject.cpp

@@ -245 +245 @@
 jobject JavaJSObject::getSlot(jint index) const
 {
+#if __LP64__
+    JS_LOG ("index = %d\n", index);
+#else
     JS_LOG ("index = %ld\n", index);
+#endif
 
     ExecState *exec = _root->interpreter()->globalExec();
@@ -258 +262 @@
 void JavaJSObject::setSlot(jint index, jobject value) const
 {
+#if __LP64__
+    JS_LOG ("index = %d, value = %p\n", index, value);
+#else
     JS_LOG ("index = %ld, value = %p\n", index, value);
+#endif
 
     ExecState *exec = _root->interpreter()->globalExec();

trunk/JavaScriptCore/kjs/collector.cpp

@@ -334 +334 @@
 #endif
 
-    int dummy;
+    void *dummy;
     void *stackPointer = &dummy;