More Quick compiler mir/bb cleanup
Removed the references to MIR and BasicBlock from the generator
for NEW_ARRAY and the compare/branch. The previously-introduced
InvokeInfo structure was sufficient for handling the NEW_ARRAY call,
so renamed it to cover both.
This CL should end this round of restructuring.
Change-Id: I9bec6a820589a562eb58f0c9688d27fabe98c064
diff --git a/src/compiler/CompilerIR.h b/src/compiler/CompilerIR.h
index 5b92af1..b1c7427 100644
--- a/src/compiler/CompilerIR.h
+++ b/src/compiler/CompilerIR.h
@@ -84,14 +84,14 @@
ArenaBitVector* bv;
};
-struct InvokeInfo {
+struct CallInfo {
int numArgWords; // Note: word count, not arg count
RegLocation* args; // One for each word of arguments
RegLocation result; // Eventual target of MOVE_RESULT
int optFlags;
InvokeType type;
uint32_t dexIdx;
- uint32_t methodIdx;
+ uint32_t index; // Method idx for invokes, type idx for FilledNewArray
uintptr_t directCode;
uintptr_t directMethod;
RegLocation target; // Target of following move_result