AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix compilation with gdbjit=on.

Browse Source 
r14919 forgot three AssertNoAllocation -> DisallowHeapAllocation replacements.

BUG=v8:2719
R=yangguo@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16093041

Patch from Kang-Hao (Kenny) Lu <kennyluck@csail.mit.edu>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15046 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yangguo@chromium.org 2013-06-10 16:31:55 +00:00
parent 946ea53264
commit 5cf0cba71a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gdb-jit.cc
View File

@ -2062,7 +2062,7 @@ void GDBJITInterface::AddCode(const char* name,
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;

2
src/mips/assembler-mips.cc
View File

@ -2198,7 +2198,7 @@ void Assembler::set_target_address_at(Address pc, Address target) {
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

2
src/objects.h
View File

@ -1433,7 +1433,7 @@ class HeapObject: public Object {
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.

4
src/regexp-macro-assembler.cc
View File

@ -113,8 +113,8 @@ NativeRegExpMacroAssembler::Result NativeRegExpMacroAssembler::Match(
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.