Title: [184713] trunk/Source/_javascript_Core
- Revision
- 184713
- Author
- o...@webkit.org
- Date
- 2015-05-21 05:29:43 -0700 (Thu, 21 May 2015)
Log Message
Fix the !ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) build after r184337
https://bugs.webkit.org/show_bug.cgi?id=145248
Reviewed by Yusuke Suzuki.
* bytecompiler/BytecodeGenerator.cpp:
* bytecompiler/BytecodeGenerator.h:
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseMemberExpression):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (184712 => 184713)
--- trunk/Source/_javascript_Core/ChangeLog 2015-05-21 12:28:22 UTC (rev 184712)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-05-21 12:29:43 UTC (rev 184713)
@@ -1,3 +1,15 @@
+2015-05-21 Csaba Osztrogonác <o...@webkit.org>
+
+ Fix the !ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) build after r184337
+ https://bugs.webkit.org/show_bug.cgi?id=145248
+
+ Reviewed by Yusuke Suzuki.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ * bytecompiler/BytecodeGenerator.h:
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseMemberExpression):
+
2015-05-20 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: array previews should have a much smaller cap on values
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (184712 => 184713)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2015-05-21 12:28:22 UTC (rev 184712)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2015-05-21 12:29:43 UTC (rev 184713)
@@ -2808,6 +2808,7 @@
emitLabel(loopDone.get());
}
+#if ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX)
RegisterID* BytecodeGenerator::emitGetTemplateObject(RegisterID* dst, TaggedTemplateNode* taggedTemplate)
{
TemplateRegistryKey::StringVector rawStrings;
@@ -2834,6 +2835,7 @@
emitLoad(arguments.thisRegister(), JSValue(addTemplateRegistryKeyConstant(TemplateRegistryKey(rawStrings, cookedStrings))));
return emitCall(dst, getTemplateObject.get(), NoExpectedFunction, arguments, taggedTemplate->divot(), taggedTemplate->divotStart(), taggedTemplate->divotEnd());
}
+#endif
RegisterID* BytecodeGenerator::emitGetEnumerableLength(RegisterID* dst, RegisterID* base)
{
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (184712 => 184713)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2015-05-21 12:28:22 UTC (rev 184712)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2015-05-21 12:29:43 UTC (rev 184713)
@@ -503,8 +503,11 @@
RegisterID* valueRegister, RegisterID* getterRegister, RegisterID* setterRegister, unsigned options, const JSTextPosition&);
void emitEnumeration(ThrowableExpressionData* enumerationNode, ExpressionNode* subjectNode, const std::function<void(BytecodeGenerator&, RegisterID*)>& callBack);
+
+#if ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX)
RegisterID* emitGetTemplateObject(RegisterID* dst, TaggedTemplateNode*);
-
+#endif
+
RegisterID* emitReturn(RegisterID* src);
RegisterID* emitEnd(RegisterID* src) { return emitUnaryNoDstOp(op_end, src); }
Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (184712 => 184713)
--- trunk/Source/_javascript_Core/parser/Parser.cpp 2015-05-21 12:28:22 UTC (rev 184712)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp 2015-05-21 12:29:43 UTC (rev 184713)
@@ -2611,6 +2611,7 @@
next();
break;
}
+#if ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX)
case TEMPLATE: {
semanticFailIfTrue(baseIsSuper, "Cannot use super as tag for tagged templates");
JSTextPosition expressionEnd = lastTokenEndPosition();
@@ -2621,6 +2622,7 @@
m_nonLHSCount = nonLHSCount;
break;
}
+#endif
default:
goto endMemberExpression;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
