Changeset 155385 in webkit

Timestamp:

Sep 9, 2013, 2:47:23 PM (13 years ago)

Author:

fpizlo@apple.com

Message:

Unreviewed, fix Ruby exception handling.

• Scripts/run-jsc-stress-tests:

Location:

trunk

Files:

• LayoutTests/fast/js/script-tests/dfg-exception.js (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/run-jsc-stress-tests (modified) (3 diffs)

trunk/LayoutTests/fast/js/script-tests/dfg-exception.js

@@ -75 +75 @@
 };
 
+noInline(test);
+noInline(doesntDFGCompile);
+
 // warmup the test method
-for (i = 0; i < 200; ++i)
+while (!dfgCompiled({f:test}))
     test(doesntDFGCompile);
 

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-09  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, fix Ruby exception handling.
+
+        * Scripts/run-jsc-stress-tests:
+
 2013-09-09  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Tools/Scripts/run-jsc-stress-tests

@@ -40 +40 @@
     require 'shellwords'
     $haveShellwords = true
-rescue => e
+rescue Exception => e
     $stderr.puts "Warning: did not find shellwords; some features will be disabled."
     $stderr.puts "Error: #{e.inspect}"
@@ -51 +51 @@
     require 'highline'
     $canRunDisplayProfilerOutput = true
-rescue => e
+rescue Exception => e
     $stderr.puts "Warning: did not find json or highline; some features will be disabled."
     $stderr.puts "Error: #{e.inspect}"
@@ -199 +199 @@
         addRunCommand("profiler", ["ruby", (HELPERS_PATH + "profiler-test-helper").to_s, (SCRIPTS_PATH + "display-profiler-output").to_s, profilerOutput.to_s, $jscPath.to_s, "-p", profilerOutput.to_s, $benchmark.to_s])
     else
+        puts "Running simple version of #{$collectionName}/#{$benchmark} because some required Ruby features are unavailable."
         run("profiler-simple", "-p", profilerOutput.to_s)
     end