| Index: src/assembler.h
|
| diff --git a/src/assembler.h b/src/assembler.h
|
| index 19f79493d17efcf5fbea6fc415e66e2513eb44d7..ccfedafa074e491a4d1e032f69b9a6fc626bb061 100644
|
| --- a/src/assembler.h
|
| +++ b/src/assembler.h
|
| @@ -391,7 +391,6 @@ class RelocInfo {
|
| DEBUG_BREAK_SLOT_AT_POSITION,
|
| DEBUG_BREAK_SLOT_AT_RETURN,
|
| DEBUG_BREAK_SLOT_AT_CALL,
|
| - DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL,
|
|
|
| EXTERNAL_REFERENCE, // The address of an external C++ function.
|
| INTERNAL_REFERENCE, // An address inside the same function.
|
| @@ -484,8 +483,7 @@ class RelocInfo {
|
| }
|
| static inline bool IsDebugBreakSlot(Mode mode) {
|
| return IsDebugBreakSlotAtPosition(mode) || IsDebugBreakSlotAtReturn(mode) ||
|
| - IsDebugBreakSlotAtCall(mode) ||
|
| - IsDebugBreakSlotAtConstructCall(mode);
|
| + IsDebugBreakSlotAtCall(mode);
|
| }
|
| static inline bool IsDebugBreakSlotAtPosition(Mode mode) {
|
| return mode == DEBUG_BREAK_SLOT_AT_POSITION;
|
| @@ -496,9 +494,6 @@ class RelocInfo {
|
| static inline bool IsDebugBreakSlotAtCall(Mode mode) {
|
| return mode == DEBUG_BREAK_SLOT_AT_CALL;
|
| }
|
| - static inline bool IsDebugBreakSlotAtConstructCall(Mode mode) {
|
| - return mode == DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL;
|
| - }
|
| static inline bool IsDebuggerStatement(Mode mode) {
|
| return mode == DEBUGGER_STATEMENT;
|
| }
|
| @@ -537,9 +532,6 @@ class RelocInfo {
|
| // constant pool, otherwise the pointer is embedded in the instruction stream.
|
| bool IsInConstantPool();
|
|
|
| - static int DebugBreakCallArgumentsCount(intptr_t data);
|
| -
|
| - // Read/modify the code target in the branch/call instruction
|
| // this relocation applies to;
|
| // can only be called if IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)
|
| INLINE(Address target_address());
|
| @@ -649,9 +641,9 @@ class RelocInfo {
|
| static const int kPositionMask = 1 << POSITION | 1 << STATEMENT_POSITION;
|
| static const int kDataMask =
|
| (1 << CODE_TARGET_WITH_ID) | kPositionMask | (1 << COMMENT);
|
| - static const int kDebugBreakSlotMask =
|
| - 1 << DEBUG_BREAK_SLOT_AT_POSITION | 1 << DEBUG_BREAK_SLOT_AT_RETURN |
|
| - 1 << DEBUG_BREAK_SLOT_AT_CALL | 1 << DEBUG_BREAK_SLOT_AT_CONSTRUCT_CALL;
|
| + static const int kDebugBreakSlotMask = 1 << DEBUG_BREAK_SLOT_AT_POSITION |
|
| + 1 << DEBUG_BREAK_SLOT_AT_RETURN |
|
| + 1 << DEBUG_BREAK_SLOT_AT_CALL;
|
| static const int kApplyMask; // Modes affected by apply. Depends on arch.
|
|
|
| private:
|
|
|