Address comments

Author: vgvassilev

clang/lib/Interpreter/CMakeLists.txt

@@ -20,7 +20,7 @@ add_clang_library(clangInterpreter
   Interpreter.cpp
   InterpreterUtils.cpp
   Value.cpp
-  WASM.cpp
+  Wasm.cpp
 
   DEPENDS
   intrinsics_gen

clang/lib/Interpreter/Interpreter.cpp

@@ -15,7 +15,7 @@
 #include "IncrementalExecutor.h"
 #include "IncrementalParser.h"
 #include "InterpreterUtils.h"
-#include "WASM.h"
+#include "Wasm.h"
 
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Mangle.h"
@@ -408,7 +408,7 @@ llvm::Error Interpreter::CreateExecutor() {
     return JB.takeError();
   llvm::Error Err = llvm::Error::success();
 #ifdef __EMSCRIPTEN__
-  auto Executor = std::make_unique<WASMIncrementalExecutor>(*TSCtx, **JB, Err);
+  auto Executor = std::make_unique<WasmIncrementalExecutor>(*TSCtx, **JB, Err);
 #else
   auto Executor = std::make_unique<IncrementalExecutor>(*TSCtx, **JB, Err);
 #endif

clang/lib/Interpreter/WASM.cpp renamed to clang/lib/Interpreter/Wasm.cpp

@@ -1,4 +1,4 @@
-//===----------------- WASM.cpp - WASM Interpreter --------------*- C++ -*-===//
+//===----------------- Wasm.cpp - Wasm Interpreter --------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "WASM.h"
+#ifdef __EMSCRIPTEN__
+
+#include "Wasm.h"
 #include "IncrementalExecutor.h"
 
 #include <llvm/IR/LegacyPassManager.h>
@@ -24,19 +26,19 @@
 
 namespace clang {
 
-WASMIncrementalExecutor::WASMIncrementalExecutor(
+WasmIncrementalExecutor::WasmIncrementalExecutor(
     llvm::orc::ThreadSafeContext &TSC)
     : IncrementalExecutor(TSC) {}
 
-llvm::Error WASMIncrementalExecutor::addModule(PartialTranslationUnit &PTU) {
+llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) {
   PTU.TheModule->dump();
 
   std::string ErrorString;
 
   const llvm::Target *Target = llvm::TargetRegistry::lookupTarget(
       PTU.TheModule->getTargetTriple(), ErrorString);
   if (!Target) {
-    return llvm::make_error<llvm::StringError>("Failed to create WASM Target: ",
+    return llvm::make_error<llvm::StringError>("Failed to create Wasm Target: ",
                                                llvm::inconvertibleErrorCode());
   }
 
@@ -53,12 +55,12 @@ llvm::Error WASMIncrementalExecutor::addModule(PartialTranslationUnit &PTU) {
   if (TargetMachine->addPassesToEmitFile(PM, OutputFile, nullptr,
                                          llvm::CGFT_ObjectFile)) {
     return llvm::make_error<llvm::StringError>(
-        "WASM backend cannot produce object.", llvm::inconvertibleErrorCode());
+        "Wasm backend cannot produce object.", llvm::inconvertibleErrorCode());
   }
 
   if (!PM.run(*PTU.TheModule)) {
 
-    return llvm::make_error<llvm::StringError>("Failed to emit WASM object.",
+    return llvm::make_error<llvm::StringError>("Failed to emit Wasm object.",
                                                llvm::inconvertibleErrorCode());
   }
 
@@ -92,16 +94,18 @@ llvm::Error WASMIncrementalExecutor::addModule(PartialTranslationUnit &PTU) {
   return llvm::Error::success();
 }
 
-llvm::Error WASMIncrementalExecutor::removeModule(PartialTranslationUnit &PTU) {
+llvm::Error WasmIncrementalExecutor::removeModule(PartialTranslationUnit &PTU) {
   return llvm::make_error<llvm::StringError>("Not implemented yet",
                                              llvm::inconvertibleErrorCode());
 }
 
-llvm::Error WASMIncrementalExecutor::runCtors() const {
+llvm::Error WasmIncrementalExecutor::runCtors() const {
   // This seems to be automatically done when using dlopen()
   return llvm::Error::success();
 }
 
-WASMIncrementalExecutor::~WASMIncrementalExecutor() = default;
+WasmIncrementalExecutor::~WasmIncrementalExecutor() = default;
 
 } // namespace clang
+
+#endif // __EMSCRIPTEN__

clang/lib/Interpreter/WASM.h renamed to clang/lib/Interpreter/Wasm.h

@@ -1,4 +1,4 @@
-//===------------------ WASM.h - WASM Interpreter ---------------*- C++ -*-===//
+//===------------------ Wasm.h - Wasm Interpreter ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -17,15 +17,15 @@
 
 namespace clang {
 
-class WASMIncrementalExecutor : public IncrementalExecutor {
+class WasmIncrementalExecutor : public IncrementalExecutor {
 public:
-  WASMIncrementalExecutor(llvm::orc::ThreadSafeContext &TSC);
+  WasmIncrementalExecutor(llvm::orc::ThreadSafeContext &TSC);
 
   llvm::Error addModule(PartialTranslationUnit &PTU) override;
   llvm::Error removeModule(PartialTranslationUnit &PTU) override;
   llvm::Error runCtors() const override;
 
-  ~WASMIncrementalExecutor() override;
+  ~WasmIncrementalExecutor() override;
 };
 
 } // namespace clang