diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 15:57:28 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:08 +0000 |
| commit | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (patch) | |
| tree | 19d8782d5686697f36b1771e7fcd46f290b82c3c /src/x64/assembler-x64-inl.h | |
| parent | 92022043ea907575278de828a5c9cf6939b51e5e (diff) | |
| download | android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.gz android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.bz2 android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.zip | |
Upgrade to V8 3.3
Merge V8 at 3.3.10.39
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I14703f418235f5ce6013b9b3e2e502407a9f6dfd
Diffstat (limited to 'src/x64/assembler-x64-inl.h')
| -rw-r--r-- | src/x64/assembler-x64-inl.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h index 9541a58b..8db54f07 100644 --- a/src/x64/assembler-x64-inl.h +++ b/src/x64/assembler-x64-inl.h @@ -61,9 +61,15 @@ void Assembler::emitw(uint16_t x) { } -void Assembler::emit_code_target(Handle<Code> target, RelocInfo::Mode rmode) { +void Assembler::emit_code_target(Handle<Code> target, + RelocInfo::Mode rmode, + unsigned ast_id) { ASSERT(RelocInfo::IsCodeTarget(rmode)); - RecordRelocInfo(rmode); + if (rmode == RelocInfo::CODE_TARGET && ast_id != kNoASTId) { + RecordRelocInfo(RelocInfo::CODE_TARGET_WITH_ID, ast_id); + } else { + RecordRelocInfo(rmode); + } int current = code_targets_.length(); if (current > 0 && code_targets_.last().is_identical_to(target)) { // Optimization if we keep jumping to the same code target. |