Title: [182004] trunk/Source/_javascript_Core
- Revision
- 182004
- Author
- [email protected]
- Date
- 2015-03-26 00:17:08 -0700 (Thu, 26 Mar 2015)
Log Message
Unreviewed, fixes to silly things. While landing fixes to r181993, I introduced crashes. This fixes them.
* dfg/DFGConstantFoldingPhase.cpp:
(JSC::DFG::ConstantFoldingPhase::foldConstants): I landed a fix for a VS warning. It broke this. Now I'm fixing it.
* ftl/FTLCompile.cpp:
(JSC::FTL::compile): Make sure we pass the module when dumping. This makes FTL debugging possible again.
* ftl/FTLState.cpp:
(JSC::FTL::State::dumpState): New overload that takes a module, so that we can call this after FTL::compile() clears State's module.
* ftl/FTLState.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (182003 => 182004)
--- trunk/Source/_javascript_Core/ChangeLog 2015-03-26 07:00:36 UTC (rev 182003)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-03-26 07:17:08 UTC (rev 182004)
@@ -1,3 +1,15 @@
+2015-03-26 Filip Pizlo <[email protected]>
+
+ Unreviewed, fixes to silly things. While landing fixes to r181993, I introduced crashes. This fixes them.
+
+ * dfg/DFGConstantFoldingPhase.cpp:
+ (JSC::DFG::ConstantFoldingPhase::foldConstants): I landed a fix for a VS warning. It broke this. Now I'm fixing it.
+ * ftl/FTLCompile.cpp:
+ (JSC::FTL::compile): Make sure we pass the module when dumping. This makes FTL debugging possible again.
+ * ftl/FTLState.cpp:
+ (JSC::FTL::State::dumpState): New overload that takes a module, so that we can call this after FTL::compile() clears State's module.
+ * ftl/FTLState.h:
+
2015-03-25 Filip Pizlo <[email protected]>
Unreviewed, fix obvious goof that was causing 32-bit debug crashes. The 64-bit version did it
Modified: trunk/Source/_javascript_Core/dfg/DFGConstantFoldingPhase.cpp (182003 => 182004)
--- trunk/Source/_javascript_Core/dfg/DFGConstantFoldingPhase.cpp 2015-03-26 07:00:36 UTC (rev 182003)
+++ trunk/Source/_javascript_Core/dfg/DFGConstantFoldingPhase.cpp 2015-03-26 07:17:08 UTC (rev 182004)
@@ -232,7 +232,10 @@
StackAccessData* data;
if (inlineCallFrame) {
data = ""
- inlineCallFrame->arguments[index.asInt32() + 1].virtualRegister(), FlushedJSValue);
+ VirtualRegister(
+ inlineCallFrame->stackOffset +
+ CallFrame::argumentOffset(index.asInt32())),
+ FlushedJSValue);
} else {
data = ""
virtualRegisterForArgument(index.asInt32() + 1), FlushedJSValue);
Modified: trunk/Source/_javascript_Core/ftl/FTLCompile.cpp (182003 => 182004)
--- trunk/Source/_javascript_Core/ftl/FTLCompile.cpp 2015-03-26 07:00:36 UTC (rev 182003)
+++ trunk/Source/_javascript_Core/ftl/FTLCompile.cpp 2015-03-26 07:17:08 UTC (rev 182004)
@@ -743,8 +743,8 @@
}
if (shouldShowDisassembly() || verboseCompilationEnabled())
- state.dumpState("after optimization");
-
+ state.dumpState(module, "after optimization");
+
// FIXME: Need to add support for the case where JIT memory allocation failed.
// https://bugs.webkit.org/show_bug.cgi?id=113620
state.generatedFunction = reinterpret_cast<GeneratedFunction>(llvm->GetPointerToGlobal(engine, state.function));
Modified: trunk/Source/_javascript_Core/ftl/FTLState.cpp (182003 => 182004)
--- trunk/Source/_javascript_Core/ftl/FTLState.cpp 2015-03-26 07:00:36 UTC (rev 182003)
+++ trunk/Source/_javascript_Core/ftl/FTLState.cpp 2015-03-26 07:17:08 UTC (rev 182004)
@@ -92,6 +92,11 @@
void State::dumpState(const char* when)
{
+ dumpState(module, when);
+}
+
+void State::dumpState(LModule module, const char* when)
+{
dataLog("LLVM IR for ", CodeBlockWithJITType(graph.m_codeBlock, FTL::JITCode::FTLJIT), " ", when, ":\n");
dumpModule(module);
}
Modified: trunk/Source/_javascript_Core/ftl/FTLState.h (182003 => 182004)
--- trunk/Source/_javascript_Core/ftl/FTLState.h 2015-03-26 07:00:36 UTC (rev 182003)
+++ trunk/Source/_javascript_Core/ftl/FTLState.h 2015-03-26 07:17:08 UTC (rev 182004)
@@ -86,6 +86,7 @@
RefPtr<DataSection> stackmapsSection;
void dumpState(const char* when);
+ void dumpState(LModule, const char* when);
HashSet<CString> nativeLoadedLibraries;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
