Title: [200948] branches/safari-602.1.32-branch/Source/_javascript_Core
Revision
200948
Author
[email protected]
Date
2016-05-16 10:47:08 -0700 (Mon, 16 May 2016)

Log Message

Merged r200666.  rdar://problem/26279421

Modified Paths

Diff

Modified: branches/safari-602.1.32-branch/Source/_javascript_Core/ChangeLog (200947 => 200948)


--- branches/safari-602.1.32-branch/Source/_javascript_Core/ChangeLog	2016-05-16 17:41:41 UTC (rev 200947)
+++ branches/safari-602.1.32-branch/Source/_javascript_Core/ChangeLog	2016-05-16 17:47:08 UTC (rev 200948)
@@ -1,3 +1,19 @@
+2016-05-16  Babak Shafiei  <[email protected]>
+
+        Merge r200666.
+
+    2016-05-10  Michael Saboff  <[email protected]>
+
+            REGRESSION(r200447): Unable to build C_LOOP with clang version 800.0.12 or higher
+            https://bugs.webkit.org/show_bug.cgi?id=157549
+
+            Reviewed by Keith Miller.
+
+            Disable debug annotations for C_LOOP builds.  They are inline assembly directives,
+            unnecessary and they cause syntax errors.
+
+            * offlineasm/asm.rb:
+
 2016-05-09  Saam barati  <[email protected]>
 
         Getter and setter on super are called with wrong "this" object

Modified: branches/safari-602.1.32-branch/Source/_javascript_Core/offlineasm/asm.rb (200947 => 200948)


--- branches/safari-602.1.32-branch/Source/_javascript_Core/offlineasm/asm.rb	2016-05-16 17:41:41 UTC (rev 200947)
+++ branches/safari-602.1.32-branch/Source/_javascript_Core/offlineasm/asm.rb	2016-05-16 17:47:08 UTC (rev 200948)
@@ -347,6 +347,14 @@
         configIndex = configuration[1]
         forSettings(computeSettingsCombinations(ast)[configIndex], ast) {
             | concreteSettings, lowLevelAST, backend |
+
+            # There could be multiple backends we are generating for, but the C_LOOP is
+            # always by itself so this check to turn off $enableDebugAnnotations won't
+            # affect the generation for any other backend.
+            if backend == "C_LOOP"
+                $enableDebugAnnotations = false
+            end
+
             lowLevelAST = lowLevelAST.resolve(*buildOffsetsMap(lowLevelAST, offsetsList))
             lowLevelAST.validate
             emitCodeInConfiguration(concreteSettings, lowLevelAST, backend) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to