diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-05-13 15:56:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-13 15:56:14 +0000 |
| commit | ad930da1d67968600aab8441c24f5c4cc6e001bd (patch) | |
| tree | 8ce7f544da7b4b0be26d19e85c70e2861b068da1 /dex2oat | |
| parent | 6f2b602999a9b5253de98e4c8749f821b0046ac2 (diff) | |
| parent | 7624d25dad2d1ba25969ae704fccf68649103ae5 (diff) | |
| download | art-ad930da1d67968600aab8441c24f5c4cc6e001bd.zip art-ad930da1d67968600aab8441c24f5c4cc6e001bd.tar.gz art-ad930da1d67968600aab8441c24f5c4cc6e001bd.tar.bz2 | |
Merge "Move quick frame info to OatQuickMethodHeader."
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 e90006e..e0bfc6b 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()); |