Skip to content

Commit 9e0d51a

Browse files
committed
Cleanup after comments
1 parent 38cc97d commit 9e0d51a

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ jobs:
8080
run: clang++ --version
8181

8282
- name: Check clang version
83-
run: clang++-17 --version
83+
run: clang++-18 --version
8484

8585
- name: Configure CMake
8686
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
8787
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
8888
run: >
8989
cmake -B ${{ steps.strings.outputs.build-output-dir }}
90-
-DCMAKE_CXX_COMPILER=clang++-17
91-
-DCMAKE_C_COMPILER=clang-17
90+
-DCMAKE_CXX_COMPILER=clang++-18
91+
-DCMAKE_C_COMPILER=clang-18
9292
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
9393
-GNinja
9494
-S ${{ github.workspace }}

src/shell/Shell.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import IRGenerator;
2121
import Parser;
2222
import CoreVM;
2323

24-
import LLVMBack;
24+
import LLVMBackend;
2525

2626
export module Shell;
2727

@@ -210,7 +210,7 @@ export class Shell final: public CoreVM::Runtime
210210
int execute(std::string const& lineBuffer)
211211
{
212212
#if defined(ENDO_USE_LLVM)
213-
return llvm_backend::executeLLVM(lineBuffer);
213+
return LLVMBackend::executeLLVM(lineBuffer);
214214
#else
215215
return executeCoreVM(lineBuffer);
216216
#endif

src/shell/llvm_executor.cpp

+41-41
Original file line numberDiff line numberDiff line change
@@ -18,50 +18,50 @@ module;
1818

1919
#include <unistd.h>
2020

21-
#include "llvm/ADT/APFloat.h"
22-
#include "llvm/ADT/STLExtras.h"
23-
#include "llvm/ADT/StringRef.h"
24-
#include "llvm/ExecutionEngine/JITSymbol.h"
25-
#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
26-
#include "llvm/ExecutionEngine/Orc/Core.h"
27-
#include "llvm/ExecutionEngine/Orc/ExecutionUtils.h"
28-
#include "llvm/ExecutionEngine/Orc/ExecutorProcessControl.h"
29-
#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
30-
#include "llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h"
31-
#include "llvm/ExecutionEngine/Orc/LLJIT.h"
32-
#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
33-
#include "llvm/ExecutionEngine/Orc/Shared/ExecutorSymbolDef.h"
34-
#include "llvm/ExecutionEngine/SectionMemoryManager.h"
35-
#include "llvm/IR/BasicBlock.h"
36-
#include "llvm/IR/Constants.h"
37-
#include "llvm/IR/DataLayout.h"
38-
#include "llvm/IR/DerivedTypes.h"
39-
#include "llvm/IR/Function.h"
40-
#include "llvm/IR/IRBuilder.h"
41-
#include "llvm/IR/Instructions.h"
42-
#include "llvm/IR/LLVMContext.h"
43-
#include "llvm/IR/Module.h"
44-
#include "llvm/IR/PassManager.h"
45-
#include "llvm/IR/Type.h"
46-
#include "llvm/IR/Verifier.h"
47-
#include "llvm/Passes/PassBuilder.h"
48-
#include "llvm/Passes/StandardInstrumentations.h"
49-
#include "llvm/Support/CommandLine.h"
50-
#include "llvm/Support/InitLLVM.h"
51-
#include "llvm/Support/TargetSelect.h"
52-
#include "llvm/Support/raw_ostream.h"
53-
#include "llvm/Target/TargetMachine.h"
54-
#include "llvm/Transforms/InstCombine/InstCombine.h"
55-
#include "llvm/Transforms/Scalar.h"
56-
#include "llvm/Transforms/Scalar/GVN.h"
57-
#include "llvm/Transforms/Scalar/Reassociate.h"
58-
#include "llvm/Transforms/Scalar/SimplifyCFG.h"
59-
#include "llvm/Transforms/Utils.h"
21+
#include <llvm/ADT/APFloat.h>
22+
#include <llvm/ADT/STLExtras.h>
23+
#include <llvm/ADT/StringRef.h>
24+
#include <llvm/ExecutionEngine/JITSymbol.h>
25+
#include <llvm/ExecutionEngine/Orc/CompileUtils.h>
26+
#include <llvm/ExecutionEngine/Orc/Core.h>
27+
#include <llvm/ExecutionEngine/Orc/ExecutionUtils.h>
28+
#include <llvm/ExecutionEngine/Orc/ExecutorProcessControl.h>
29+
#include <llvm/ExecutionEngine/Orc/IRCompileLayer.h>
30+
#include <llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h>
31+
#include <llvm/ExecutionEngine/Orc/LLJIT.h>
32+
#include <llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h>
33+
#include <llvm/ExecutionEngine/Orc/Shared/ExecutorSymbolDef.h>
34+
#include <llvm/ExecutionEngine/SectionMemoryManager.h>
35+
#include <llvm/IR/BasicBlock.h>
36+
#include <llvm/IR/Constants.h>
37+
#include <llvm/IR/DataLayout.h>
38+
#include <llvm/IR/DerivedTypes.h>
39+
#include <llvm/IR/Function.h>
40+
#include <llvm/IR/IRBuilder.h>
41+
#include <llvm/IR/Instructions.h>
42+
#include <llvm/IR/LLVMContext.h>
43+
#include <llvm/IR/Module.h>
44+
#include <llvm/IR/PassManager.h>
45+
#include <llvm/IR/Type.h>
46+
#include <llvm/IR/Verifier.h>
47+
#include <llvm/Passes/PassBuilder.h>
48+
#include <llvm/Passes/StandardInstrumentations.h>
49+
#include <llvm/Support/CommandLine.h>
50+
#include <llvm/Support/InitLLVM.h>
51+
#include <llvm/Support/TargetSelect.h>
52+
#include <llvm/Support/raw_ostream.h>
53+
#include <llvm/Target/TargetMachine.h>
54+
#include <llvm/Transforms/InstCombine/InstCombine.h>
55+
#include <llvm/Transforms/Scalar.h>
56+
#include <llvm/Transforms/Scalar/GVN.h>
57+
#include <llvm/Transforms/Scalar/Reassociate.h>
58+
#include <llvm/Transforms/Scalar/SimplifyCFG.h>
59+
#include <llvm/Transforms/Utils.h>
6060

6161
using namespace llvm;
6262
using namespace llvm::orc;
6363

64-
export module LLVMBack;
64+
export module LLVMBackend;
6565

6666
class TestJIT
6767
{
@@ -260,7 +260,7 @@ int jitPart(std::string input)
260260
return EXIT_SUCCESS;
261261
}
262262

263-
export namespace llvm_backend
263+
export namespace LLVMBackend
264264
{
265265

266266
int executeLLVM(std::string const& lineBuffer)

src/shell/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using namespace std::string_literals;
55

66
import Shell;
7-
import LLVMBack;
7+
import LLVMBackend;
88

99
std::string_view getEnvironment(std::string_view name, std::string_view defaultValue)
1010
{
@@ -18,7 +18,7 @@ int main(int argc, char const* argv[])
1818

1919
setsid();
2020

21-
llvm_backend::init();
21+
LLVMBackend::init();
2222

2323
if (argc == 2)
2424
// This here only exists for early-development debugging purposes.

0 commit comments

Comments
 (0)