Title: [163227] trunk/Source/_javascript_Core
- Revision
- 163227
- Author
- [email protected]
- Date
- 2014-01-31 17:59:05 -0800 (Fri, 31 Jan 2014)
Log Message
Gardening: Fix a merge problem to unbreak bots.
Not reviewed.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (163226 => 163227)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-01 01:40:44 UTC (rev 163226)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-01 01:59:05 UTC (rev 163227)
@@ -1,3 +1,12 @@
+2014-01-31 Mark Lam <[email protected]>
+
+ Gardening: Fix a merge problem to unbreak bots.
+
+ Not reviewed.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+
2014-01-31 Oliver Hunt <[email protected]>
Rollout r163195 and related patches
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (163226 => 163227)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2014-02-01 01:40:44 UTC (rev 163226)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2014-02-01 01:59:05 UTC (rev 163227)
@@ -219,16 +219,6 @@
, m_usesExceptions(false)
, m_expressionTooDeep(false)
{
-<<<<<<< Updated upstream
- if (m_isBuiltinFunction) {
- m_shouldEmitProfileHooks = false;
- m_shouldEmitDebugHooks = false;
- }
-=======
- if (m_shouldEmitDebugHooks)
- m_codeBlock->setNeedsFullScopeChain(true);
->>>>>>> Stashed changes
-
m_symbolTable->setUsesNonStrictEval(codeBlock->usesEval() && !codeBlock->isStrictMode());
Vector<Identifier> boundParameterProperties;
FunctionParameters& parameters = *functionBody->parameters();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
