Revision: 20100
Author: [email protected]
Date: Thu Mar 20 09:10:15 2014 UTC
Log: A64: clean up pending reloc info if code generation was aborted.
This fixes assertion failure in destructor of Assembler.
BUG=352659
LOG=N
[email protected]
Review URL: https://codereview.chromium.org/206213002
http://code.google.com/p/v8/source/detail?r=20100
Modified:
/branches/bleeding_edge/src/a64/assembler-a64.h
/branches/bleeding_edge/src/assembler.h
/branches/bleeding_edge/src/lithium.cc
=======================================
--- /branches/bleeding_edge/src/a64/assembler-a64.h Wed Mar 19 10:32:12
2014 UTC
+++ /branches/bleeding_edge/src/a64/assembler-a64.h Thu Mar 20 09:10:15
2014 UTC
@@ -743,6 +743,10 @@
virtual ~Assembler();
+ virtual void AbortedCodeGeneration() {
+ num_pending_reloc_info_ = 0;
+ }
+
// System functions
---------------------------------------------------------
// Start generating code from the beginning of the buffer, discarding
any code
// and data that has already been emitted into the buffer.
=======================================
--- /branches/bleeding_edge/src/assembler.h Wed Mar 19 10:32:12 2014 UTC
+++ /branches/bleeding_edge/src/assembler.h Thu Mar 20 09:10:15 2014 UTC
@@ -81,6 +81,10 @@
static void QuietNaN(HeapObject* nan) { }
int pc_offset() const { return static_cast<int>(pc_ - buffer_); }
+
+ // This function is called when code generation is aborted, so that
+ // the assembler could clean up internal data structures.
+ virtual void AbortedCodeGeneration() { }
static const int kMinimalBufferSize = 4*KB;
=======================================
--- /branches/bleeding_edge/src/lithium.cc Tue Mar 11 02:55:06 2014 UTC
+++ /branches/bleeding_edge/src/lithium.cc Thu Mar 20 09:10:15 2014 UTC
@@ -446,6 +446,7 @@
CodeGenerator::PrintCode(code, info());
return code;
}
+ assembler.AbortedCodeGeneration();
return Handle<Code>::null();
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
