Title: [200899] tags/Safari-602.1.32.2.1/Source/_javascript_Core
- Revision
- 200899
- Author
- matthew_han...@apple.com
- Date
- 2016-05-13 16:53:51 -0700 (Fri, 13 May 2016)
Log Message
Merge r200666.
Modified Paths
Diff
Modified: tags/Safari-602.1.32.2.1/Source/_javascript_Core/ChangeLog (200898 => 200899)
--- tags/Safari-602.1.32.2.1/Source/_javascript_Core/ChangeLog 2016-05-13 23:45:44 UTC (rev 200898)
+++ tags/Safari-602.1.32.2.1/Source/_javascript_Core/ChangeLog 2016-05-13 23:53:51 UTC (rev 200899)
@@ -1,3 +1,19 @@
+2016-05-13 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r200666.
+
+ 2016-05-10 Michael Saboff <msab...@apple.com>
+
+ 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 <sbar...@apple.com>
Getter and setter on super are called with wrong "this" object
Modified: tags/Safari-602.1.32.2.1/Source/_javascript_Core/offlineasm/asm.rb (200898 => 200899)
--- tags/Safari-602.1.32.2.1/Source/_javascript_Core/offlineasm/asm.rb 2016-05-13 23:45:44 UTC (rev 200898)
+++ tags/Safari-602.1.32.2.1/Source/_javascript_Core/offlineasm/asm.rb 2016-05-13 23:53:51 UTC (rev 200899)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
