Fix oatdump "compilercallbacks" option for runtime.
The "compilercallbacks" runtime option replaced "compiler"
in I708ca13227c809e07917ff3879a89722017e83a9 .
Fix a comment in codegen_util.cc .
Change-Id: I2c5ebd56dd96f0ee8e62b602bfe45357565471ff
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc
index 65286d5..29554c0 100644
--- a/compiler/dex/quick/codegen_util.cc
+++ b/compiler/dex/quick/codegen_util.cc
@@ -1003,7 +1003,7 @@
/*
* Custom codegen for special cases. If for any reason the
- * special codegen doesn't succeed, first_lir_insn_ will
+ * special codegen doesn't succeed, first_lir_insn_ will be
* set to NULL;
*/
// TODO: Clean up GenSpecial() and return true only if special implementation is emitted.
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index e219dd3..9bde30d 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 @@
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:";
