Changeset 20835 in webkit for trunk/JavaScriptCore

Timestamp:

Apr 10, 2007, 3:27:26 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by John Sullivan, Darin Adler.

Fixed <rdar://problem/5121899> JavaScript garbage collection leads to
later crash under Rosetta (should abort or leak instead?)

Log an error message and crash if the kernel reports failure during GC.
We decided to do this instead of just leaking because we don't want people
to get the mistaken impression that running in Rosetta is a supported
configurtion.

The CRASH macro will also hook into CrashReporter, which will tell us if
many (any?) users run into this issue.

• kjs/collector.cpp: (KJS::getPlatformThreadRegisters):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-04-10  Geoffrey Garen  <[email protected]>
+
+        Reviewed by John Sullivan, Darin Adler.
+        
+        Fixed <rdar://problem/5121899> JavaScript garbage collection leads to 
+        later crash under Rosetta (should abort or leak instead?)
+        
+        Log an error message and crash if the kernel reports failure during GC.
+        We decided to do this instead of just leaking because we don't want people
+        to get the mistaken impression that running in Rosetta is a supported
+        configurtion.
+        
+        The CRASH macro will also hook into CrashReporter, which will tell us if 
+        many (any?) users run into this issue.
+
+        * kjs/collector.cpp:
+        (KJS::getPlatformThreadRegisters):
+
 2007-04-06  Krzysztof Kowalczyk  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1390 +1390 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
+                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;
@@ -1395 +1396 @@
                         projectDirPath = "";
                         projectRoot = "";
+                        shouldCheckCompatibility = 1;
                         targets = (
                                 932F5BE30822A1C700736975 /* All */,

trunk/JavaScriptCore/kjs/collector.cpp

@@ -499 +499 @@
 #endif
 
-  thread_get_state(platformThread, flavor, (thread_state_t)&regs, &user_count);
+  kern_return_t result = thread_get_state(platformThread, flavor, (thread_state_t)&regs, &user_count);
+  if (result != KERN_SUCCESS) {
+    LOG_ERROR("JavaScript garbage collection failed because thread_get_state returned an error (%d). This is probably the result of running inside Rosetta, which is not supported.", result);
+    CRASH();
+  }
   return user_count * sizeof(usword_t);
 // end PLATFORM(DARWIN)