Title: [194050] trunk/Source/_javascript_Core
Revision
194050
Author
[email protected]
Date
2015-12-14 12:28:23 -0800 (Mon, 14 Dec 2015)

Log Message

Unreviewed, fix merge issue in a test.

* b3/testb3.cpp:
(JSC::B3::testCheckTwoMegaCombos):
(JSC::B3::testCheckTwoNonRedundantMegaCombos):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (194049 => 194050)


--- trunk/Source/_javascript_Core/ChangeLog	2015-12-14 20:27:08 UTC (rev 194049)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-12-14 20:28:23 UTC (rev 194050)
@@ -1,5 +1,13 @@
 2015-12-14  Filip Pizlo  <[email protected]>
 
+        Unreviewed, fix merge issue in a test.
+
+        * b3/testb3.cpp:
+        (JSC::B3::testCheckTwoMegaCombos):
+        (JSC::B3::testCheckTwoNonRedundantMegaCombos):
+
+2015-12-14  Filip Pizlo  <[email protected]>
+
         B3 should not give ValueReps for the non-stackmap children of a CheckValue to the generator callback
         https://bugs.webkit.org/show_bug.cgi?id=152224
 

Modified: trunk/Source/_javascript_Core/b3/testb3.cpp (194049 => 194050)


--- trunk/Source/_javascript_Core/b3/testb3.cpp	2015-12-14 20:27:08 UTC (rev 194049)
+++ trunk/Source/_javascript_Core/b3/testb3.cpp	2015-12-14 20:28:23 UTC (rev 194050)
@@ -5727,7 +5727,7 @@
     check->setGenerator(
         [&] (CCallHelpers& jit, const StackmapGenerationParams& params) {
             AllowMacroScratchRegisterUsage allowScratch(jit);
-            CHECK(params.size() == 1);
+            CHECK(!params.size());
 
             // This should always work because a function this simple should never have callee
             // saves.
@@ -5739,7 +5739,7 @@
     check2->setGenerator(
         [&] (CCallHelpers& jit, const StackmapGenerationParams& params) {
             AllowMacroScratchRegisterUsage allowScratch(jit);
-            CHECK(params.size() == 1);
+            CHECK(!params.size());
 
             // This should always work because a function this simple should never have callee
             // saves.
@@ -5805,7 +5805,7 @@
     check->setGenerator(
         [&] (CCallHelpers& jit, const StackmapGenerationParams& params) {
             AllowMacroScratchRegisterUsage allowScratch(jit);
-            CHECK(params.size() == 1);
+            CHECK(!params.size());
 
             // This should always work because a function this simple should never have callee
             // saves.
@@ -5820,7 +5820,7 @@
     check2->setGenerator(
         [&] (CCallHelpers& jit, const StackmapGenerationParams& params) {
             AllowMacroScratchRegisterUsage allowScratch(jit);
-            CHECK(params.size() == 1);
+            CHECK(!params.size());
 
             // This should always work because a function this simple should never have callee
             // saves.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to