Title: [185063] trunk/Source/_javascript_Core
- Revision
- 185063
- Author
- mark....@apple.com
- Date
- 2015-06-01 10:57:18 -0700 (Mon, 01 Jun 2015)
Log Message
HandlerInfo::initialize() should not assume that CodeLocationLabel is available.
https://bugs.webkit.org/show_bug.cgi?id=145515
Reviewed by Csaba Osztrogonác.
CodeLocationLabel is only defined for ENABLE(ASSEMBLER) builds. r185022's
attempt at simplifying code to increase readability failed to take this into
account. This patch fixes it.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
* bytecode/HandlerInfo.h:
(JSC::HandlerInfo::initialize):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (185062 => 185063)
--- trunk/Source/_javascript_Core/ChangeLog 2015-06-01 17:13:26 UTC (rev 185062)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-06-01 17:57:18 UTC (rev 185063)
@@ -1,3 +1,19 @@
+2015-06-01 Mark Lam <mark....@apple.com>
+
+ HandlerInfo::initialize() should not assume that CodeLocationLabel is available.
+ https://bugs.webkit.org/show_bug.cgi?id=145515
+
+ Reviewed by Csaba Osztrogonác.
+
+ CodeLocationLabel is only defined for ENABLE(ASSEMBLER) builds. r185022's
+ attempt at simplifying code to increase readability failed to take this into
+ account. This patch fixes it.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+ * bytecode/HandlerInfo.h:
+ (JSC::HandlerInfo::initialize):
+
2015-05-31 Filip Pizlo <fpi...@apple.com>
Unreviewed, add a FIXME referencing https://bugs.webkit.org/show_bug.cgi?id=145503.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (185062 => 185063)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-06-01 17:13:26 UTC (rev 185062)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-06-01 17:57:18 UTC (rev 185063)
@@ -1823,8 +1823,12 @@
for (size_t i = 0; i < count; i++) {
const UnlinkedHandlerInfo& unlinkedHandler = unlinkedCodeBlock->exceptionHandler(i);
HandlerInfo& handler = m_rareData->m_exceptionHandlers[i];
+#if ENABLE(JIT)
handler.initialize(unlinkedHandler, nonLocalScopeDepth,
CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(op_catch))));
+#else
+ handler.initialize(unlinkedHandler, nonLocalScopeDepth);
+#endif
}
}
Modified: trunk/Source/_javascript_Core/bytecode/HandlerInfo.h (185062 => 185063)
--- trunk/Source/_javascript_Core/bytecode/HandlerInfo.h 2015-06-01 17:13:26 UTC (rev 185062)
+++ trunk/Source/_javascript_Core/bytecode/HandlerInfo.h 2015-06-01 17:57:18 UTC (rev 185063)
@@ -48,20 +48,21 @@
};
struct HandlerInfo : public HandlerInfoBase {
- void initialize(const UnlinkedHandlerInfo& unlinkedInfo, size_t nonLocalScopeDepth, CodeLocationLabel label)
+ void initialize(const UnlinkedHandlerInfo& unlinkedInfo, size_t nonLocalScopeDepth)
{
start = unlinkedInfo.start;
end = unlinkedInfo.end;
target = unlinkedInfo.target;
scopeDepth = unlinkedInfo.scopeDepth + nonLocalScopeDepth;
+ }
+
#if ENABLE(JIT)
+ void initialize(const UnlinkedHandlerInfo& unlinkedInfo, size_t nonLocalScopeDepth, CodeLocationLabel label)
+ {
+ initialize(unlinkedInfo, nonLocalScopeDepth);
nativeCode = label;
-#else
- UNUSED_PARAM(label);
-#endif
}
-#if ENABLE(JIT)
CodeLocationLabel nativeCode;
#endif
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
