Revision: 15046
Author: [email protected]
Date: Mon Jun 10 09:31:55 2013
Log: Fix compilation with gdbjit=on.
r14919 forgot three AssertNoAllocation -> DisallowHeapAllocation
replacements.
BUG=v8:2719
[email protected]
Review URL: https://chromiumcodereview.appspot.com/16093041
Patch from Kang-Hao (Kenny) Lu <[email protected]>.
http://code.google.com/p/v8/source/detail?r=15046
Modified:
/branches/bleeding_edge/src/gdb-jit.cc
/branches/bleeding_edge/src/mips/assembler-mips.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/regexp-macro-assembler.cc
=======================================
--- /branches/bleeding_edge/src/gdb-jit.cc Tue Apr 16 05:30:51 2013
+++ /branches/bleeding_edge/src/gdb-jit.cc Mon Jun 10 09:31:55 2013
@@ -2062,7 +2062,7 @@
if (!FLAG_gdbjit) return;
ScopedLock lock(mutex.Pointer());
- AssertNoAllocation no_gc;
+ DisallowHeapAllocation no_gc;
HashMap::Entry* e = GetEntries()->Lookup(code, HashForCodeObject(code),
true);
if (e->value != NULL && !IsLineInfoTagged(e->value)) return;
=======================================
--- /branches/bleeding_edge/src/mips/assembler-mips.cc Mon Jun 3 08:32:22
2013
+++ /branches/bleeding_edge/src/mips/assembler-mips.cc Mon Jun 10 09:31:55
2013
@@ -2198,7 +2198,7 @@
bool in_range = (ipc ^ static_cast<uint32_t>(itarget) >>
(kImm26Bits + kImmFieldShift)) == 0;
uint32_t target_field =
- static_cast<uint32_t>(itarget & kJumpAddrMask) >>kImmFieldShift;
+ static_cast<uint32_t>(itarget & kJumpAddrMask) >> kImmFieldShift;
bool patched_jump = false;
#ifndef ALLOW_JAL_IN_BOUNDARY_REGION
=======================================
--- /branches/bleeding_edge/src/objects.h Mon Jun 10 02:26:18 2013
+++ /branches/bleeding_edge/src/objects.h Mon Jun 10 09:31:55 2013
@@ -1433,7 +1433,7 @@
static inline HeapObject* cast(Object* obj);
// Return the write barrier mode for this. Callers of this function
- // must be able to present a reference to an AssertNoAllocation
+ // must be able to present a reference to an DisallowHeapAllocation
// object as a sign that they are not going to use this function
// from code that allocates and thus invalidates the returned write
// barrier mode.
=======================================
--- /branches/bleeding_edge/src/regexp-macro-assembler.cc Mon Jan 21
08:11:31 2013
+++ /branches/bleeding_edge/src/regexp-macro-assembler.cc Mon Jun 10
09:31:55 2013
@@ -113,8 +113,8 @@
ASSERT(previous_index <= subject->length());
// No allocations before calling the regexp, but we can't use
- // AssertNoAllocation, since regexps might be preempted, and another
thread
- // might do allocation anyway.
+ // DisallowHeapAllocation, since regexps might be preempted, and another
+ // thread might do allocation anyway.
String* subject_ptr = *subject;
// Character offsets into string.
--
--
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/groups/opt_out.
