diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-01-02 09:44:23 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-01-02 16:44:08 +0000 |
| commit | 5115473c81ec855a5646a5f755afb26aa7f2b1e9 (patch) | |
| tree | 5c2093baffdac8ecd62d08412202a7319689df89 /oatdump | |
| parent | a72a4b4d7d1d32913f44f07db7c5744905f81f54 (diff) | |
| download | art-5115473c81ec855a5646a5f755afb26aa7f2b1e9.tar.gz art-5115473c81ec855a5646a5f755afb26aa7f2b1e9.tar.bz2 art-5115473c81ec855a5646a5f755afb26aa7f2b1e9.zip | |
Fix oatdump "compilercallbacks" option for runtime.
The "compilercallbacks" runtime option replaced "compiler"
in I708ca13227c809e07917ff3879a89722017e83a9 .
Fix a comment in codegen_util.cc .
Change-Id: I2c5ebd56dd96f0ee8e62b602bfe45357565471ff
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/oatdump.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index e219dd33a2..9bde30d90b 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -26,6 +26,7 @@ #include "base/unix_file/fd_file.h" #include "class_linker.h" #include "class_linker-inl.h" +#include "compiler_callbacks.h" #include "dex_file-inl.h" #include "dex_instruction.h" #include "disassembler.h" @@ -1456,7 +1457,12 @@ static int oatdump(int argc, char** argv) { std::string boot_oat_option; // We are more like a compiler than a run-time. We don't want to execute code. - options.push_back(std::make_pair("compiler", reinterpret_cast<void*>(NULL))); + struct OatDumpCompilerCallbacks : CompilerCallbacks { + virtual bool MethodVerified(verifier::MethodVerifier* /*verifier*/) { return true; } + virtual void ClassRejected(ClassReference /*ref*/) { } + } callbacks; + options.push_back(std::make_pair("compilercallbacks", + static_cast<CompilerCallbacks*>(&callbacks))); if (boot_image_filename != NULL) { boot_image_option += "-Ximage:"; |