diff options
author | 2024-12-04 11:43:38 +0000 | |
---|---|---|
committer | 2024-12-04 15:18:00 +0000 | |
commit | 701e215aa52ac710d3d4b1bf3dac5abb3f57750e (patch) | |
tree | 48480ac2c0970974d4c256966b1387e37da44737 /libdexfile | |
parent | a0bdc8d7d84a470aabdb6a3bc5a0fa06a7d9dc84 (diff) |
Remove remnants of quickened opcode verification.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 170086509
Change-Id: I1865f016934158e2691116b59a5b6d462c99eccb
Diffstat (limited to 'libdexfile')
-rw-r--r-- | libdexfile/dex/dex_instruction.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/libdexfile/dex/dex_instruction.h b/libdexfile/dex/dex_instruction.h index f6950af9a0..3b7fe4668e 100644 --- a/libdexfile/dex/dex_instruction.h +++ b/libdexfile/dex/dex_instruction.h @@ -132,8 +132,6 @@ class Instruction { kIndexStringRef, // string reference index kIndexMethodRef, // method reference index kIndexFieldRef, // field reference index - kIndexFieldOffset, // field offset (for static linked fields) - kIndexVtableOffset, // vtable offset (for static linked methods) kIndexMethodAndProtoRef, // method and a proto reference index (for invoke-polymorphic) kIndexCallSiteRef, // call site reference index kIndexMethodHandleRef, // constant method handle reference index @@ -195,12 +193,11 @@ class Instruction { kVerifyVarArgNonZero = 0x0040000, kVerifyVarArgRange = 0x0080000, kVerifyVarArgRangeNonZero = 0x0100000, - kVerifyRuntimeOnly = 0x0200000, - kVerifyError = 0x0400000, - kVerifyRegHPrototype = 0x0800000, - kVerifyRegBCallSite = 0x1000000, - kVerifyRegBMethodHandle = 0x2000000, - kVerifyRegBPrototype = 0x4000000, + kVerifyError = 0x0200000, + kVerifyRegHPrototype = 0x0400000, + kVerifyRegBCallSite = 0x0800000, + kVerifyRegBMethodHandle = 0x1000000, + kVerifyRegBPrototype = 0x2000000, }; // Collect the enums in a struct for better locality. @@ -563,12 +560,6 @@ class Instruction { // Returns true if the instruction allows control flow to go to the following instruction. bool CanFlowThrough() const; - // Returns true if the instruction is a quickened instruction. - bool IsQuickened() const { - return (kInstructionDescriptors[Opcode()].index_type == kIndexFieldOffset) || - (kInstructionDescriptors[Opcode()].index_type == kIndexVtableOffset); - } - // Returns true if this instruction is a switch. bool IsSwitch() const { return (kInstructionDescriptors[Opcode()].flags & kSwitch) != 0; @@ -624,10 +615,6 @@ class Instruction { kVerifyVarArgRange | kVerifyVarArgRangeNonZero | kVerifyError)); } - bool GetVerifyIsRuntimeOnly() const { - return (kInstructionDescriptors[Opcode()].verify_flags & kVerifyRuntimeOnly) != 0; - } - // Get the dex PC of this instruction as a offset in code units from the beginning of insns. uint32_t GetDexPc(const uint16_t* insns) const { return (reinterpret_cast<const uint16_t*>(this) - insns); |