diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-05-02 14:40:15 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-05-13 11:43:22 +0100 |
| commit | 7624d25dad2d1ba25969ae704fccf68649103ae5 (patch) | |
| tree | de72194b76a4e23e0b15ec4085447ae7e4425815 /dex2oat | |
| parent | e1910f1d802dff79bba5ef61e1c4fd0b95f6e5b0 (diff) | |
| download | art-7624d25dad2d1ba25969ae704fccf68649103ae5.zip art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.gz art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.bz2 | |
Move quick frame info to OatQuickMethodHeader.
Rename OatMethodHeader to OatQuickMethodHeader, move frame
info from OatMethodOffsets to OatQuickMethodHeader. Retrieve
the info from other places for non-quick methods (portable
compiled bytecode or jni stub, generic jni, runtime,
abstract and proxy).
This change has a libcore/ companion CL
"Remove ArtMethod's quick fields for frame size and spills."
https://android-review.googlesource.com/94164
Bug: 11767815
Change-Id: I0e31a7875d76732e1ec479c86b9b5ca01203507f
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 3529c27..c2af767 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -444,10 +444,11 @@ class Dex2Oat { return false; } Runtime* runtime = Runtime::Current(); + runtime->SetInstructionSet(instruction_set); for (int i = 0; i < Runtime::kLastCalleeSaveType; i++) { Runtime::CalleeSaveType type = Runtime::CalleeSaveType(i); if (!runtime->HasCalleeSaveMethod(type)) { - runtime->SetCalleeSaveMethod(runtime->CreateCalleeSaveMethod(instruction_set, type), type); + runtime->SetCalleeSaveMethod(runtime->CreateCalleeSaveMethod(type), type); } } runtime->GetClassLinker()->FixupDexCaches(runtime->GetResolutionMethod()); |