Reviewers: Michael Starzinger, svenpanne, yurys,
Message:
PTAL
Description:
Move DEOPT_REASON enum value out of long encoding modes range.
Otherwise INTERNAL_REFERENCE overlaps with hardcoded extra tag values.
BUG=452067
LOG=n
Please review this at https://codereview.chromium.org/902863004/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+3, -2 lines):
M src/assembler.h
M src/assembler.cc
Index: src/assembler.cc
diff --git a/src/assembler.cc b/src/assembler.cc
index
80374e6c21bec22329409d0133e73f6144a877ef..4c5eda198106e5c9ef9bac136788e5188dad9b84
100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -482,7 +482,7 @@ void RelocInfoWriter::Write(const RelocInfo* rinfo) {
int saved_mode = rmode - RelocInfo::LAST_COMPACT_ENUM;
// For all other modes we simply use the mode as the extra tag.
// None of these modes need a data component.
- DCHECK(saved_mode < kPCJumpExtraTag && saved_mode < kDataJumpExtraTag);
+ DCHECK(saved_mode < kPoolExtraTag);
WriteExtraTaggedPC(pc_delta, saved_mode);
}
last_pc_ = rinfo->pc();
Index: src/assembler.h
diff --git a/src/assembler.h b/src/assembler.h
index
11cdbe237d610ba973c1c9972f6c412009b57b29..2f2c73a9ce1ec419c9a2eaf652c94516d0645170
100644
--- a/src/assembler.h
+++ b/src/assembler.h
@@ -373,7 +373,6 @@ class RelocInfo {
RUNTIME_ENTRY,
JS_RETURN, // Marks start of the ExitJSFrame code.
COMMENT,
- DEOPT_REASON, // Deoptimization reason index.
POSITION, // See comment for kNoPosition above.
STATEMENT_POSITION, // See comment for kNoPosition above.
DEBUG_BREAK_SLOT, // Additional code inserted for debug break slot.
@@ -385,6 +384,8 @@ class RelocInfo {
CONST_POOL,
VENEER_POOL,
+ DEOPT_REASON, // Deoptimization reason index.
+
// add more as needed
// Pseudo-types
NUMBER_OF_MODES, // There are at most 15 modes with noncompact
encoding.
--
--
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.
