diff --git a/src/compiler.cc b/src/compiler.cc
index 4664987..40874f5 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -347,7 +347,7 @@
                            const std::vector<const DexFile*>& dex_files) {
   SetGcMaps(class_loader, dex_files);
 #if defined(ART_USE_LLVM_COMPILER)
-  compiler_llvm_->MaterializeLLVMModule();
+  compiler_llvm_->MaterializeEveryCompilationUnit();
 #endif
 }
 
@@ -1149,4 +1149,14 @@
   compiled_method->SetGcMap(*gc_map);
 }
 
+#if defined(ART_USE_LLVM_COMPILER)
+void Compiler::SetElfFileName(std::string const& filename) {
+  compiler_llvm_->SetElfFileName(filename);
+}
+
+void Compiler::SetBitcodeFileName(std::string const& filename) {
+  compiler_llvm_->SetBitcodeFileName(filename);
+}
+#endif
+
 }  // namespace art