LLVMLoopAnalyzer -> LLVMTypeAnalyzer

Author: adazem009

src/engine/internal/llvm/CMakeLists.txt

@@ -17,8 +17,8 @@ target_sources(scratchcpp
     llvmtypes.h
     llvmfunctions.cpp
     llvmloopscope.h
-    llvmloopanalyzer.cpp
-    llvmloopanalyzer.h
+    llvmtypeanalyzer.cpp
+    llvmtypeanalyzer.h
     llvmcompilercontext.cpp
     llvmcompilercontext.h
     llvmexecutablecode.cpp

…ngine/internal/llvm/llvmloopanalyzer.cpp …ngine/internal/llvm/llvmtypeanalyzer.cppsrc/engine/internal/llvm/llvmloopanalyzer.cpp renamed to src/engine/internal/llvm/llvmtypeanalyzer.cpp src/engine/internal/llvm/llvmloopanalyzer.cpp renamed to src/engine/internal/llvm/llvmtypeanalyzer.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-#include "llvmloopanalyzer.h"
+#include "llvmtypeanalyzer.h"
 #include "llvminstruction.h"
 #include "llvmvariableptr.h"
 
@@ -9,7 +9,7 @@ using namespace libscratchcpp;
 static const std::unordered_set<LLVMInstruction::Type>
     BEGIN_LOOP_INSTRUCTIONS = { LLVMInstruction::Type::BeginRepeatLoop, LLVMInstruction::Type::BeginWhileLoop, LLVMInstruction::Type::BeginRepeatUntilLoop };
 
-bool LLVMLoopAnalyzer::variableTypeChanges(LLVMVariablePtr *varPtr, LLVMInstruction *loopBody, Compiler::StaticType preLoopType) const
+bool LLVMTypeAnalyzer::variableTypeChangesInLoop(LLVMVariablePtr *varPtr, LLVMInstruction *loopBody, Compiler::StaticType preLoopType) const
 {
     if (!varPtr || !loopBody)
         return false;
@@ -38,18 +38,18 @@ bool LLVMLoopAnalyzer::variableTypeChanges(LLVMVariablePtr *varPtr, LLVMInstruct
         return true;
     }
 
-    return variableTypeChangesFromEnd(varPtr, ins, preLoopType);
+    return variableTypeChangesInLoopFromEnd(varPtr, ins, preLoopType);
 }
 
-bool LLVMLoopAnalyzer::variableTypeChangesFromEnd(LLVMVariablePtr *varPtr, LLVMInstruction *loopEnd, Compiler::StaticType preLoopType) const
+bool LLVMTypeAnalyzer::variableTypeChangesInLoopFromEnd(LLVMVariablePtr *varPtr, LLVMInstruction *loopEnd, Compiler::StaticType preLoopType) const
 {
     // Find the last write instruction
     LLVMInstruction *ins = loopEnd->previous;
 
     while (ins && !isLoopStart(ins)) {
         if (isLoopEnd(ins) || isIfEnd(ins) || isElse(ins)) {
             // Nested loop or if statement
-            if (variableTypeChangesFromEnd(varPtr, ins, preLoopType))
+            if (variableTypeChangesInLoopFromEnd(varPtr, ins, preLoopType))
                 return true;
 
             // Skip the loop or if statement
@@ -83,32 +83,32 @@ bool LLVMLoopAnalyzer::variableTypeChangesFromEnd(LLVMVariablePtr *varPtr, LLVMI
     return false;
 }
 
-bool LLVMLoopAnalyzer::isLoopStart(LLVMInstruction *ins) const
+bool LLVMTypeAnalyzer::isLoopStart(LLVMInstruction *ins) const
 {
     return (BEGIN_LOOP_INSTRUCTIONS.find(ins->type) != BEGIN_LOOP_INSTRUCTIONS.cend());
 }
 
-bool LLVMLoopAnalyzer::isLoopEnd(LLVMInstruction *ins) const
+bool LLVMTypeAnalyzer::isLoopEnd(LLVMInstruction *ins) const
 {
     return (ins->type == LLVMInstruction::Type::EndLoop);
 }
 
-bool LLVMLoopAnalyzer::isIfStart(LLVMInstruction *ins) const
+bool LLVMTypeAnalyzer::isIfStart(LLVMInstruction *ins) const
 {
     return (ins->type == LLVMInstruction::Type::BeginIf);
 }
 
-bool LLVMLoopAnalyzer::isElse(LLVMInstruction *ins) const
+bool LLVMTypeAnalyzer::isElse(LLVMInstruction *ins) const
 {
     return (ins->type == LLVMInstruction::Type::BeginElse);
 }
 
-bool LLVMLoopAnalyzer::isIfEnd(LLVMInstruction *ins) const
+bool LLVMTypeAnalyzer::isIfEnd(LLVMInstruction *ins) const
 {
     return (ins->type == LLVMInstruction::Type::EndIf);
 }
 
-Compiler::StaticType LLVMLoopAnalyzer::optimizeRegisterType(LLVMRegister *reg) const
+Compiler::StaticType LLVMTypeAnalyzer::optimizeRegisterType(LLVMRegister *reg) const
 {
     // TODO: Move this method out if it's used in LLVMCodeBuilder too
     assert(reg);
@@ -122,15 +122,15 @@ Compiler::StaticType LLVMLoopAnalyzer::optimizeRegisterType(LLVMRegister *reg) c
     return ret;
 }
 
-Compiler::StaticType LLVMLoopAnalyzer::writeValueType(LLVMInstruction *ins) const
+Compiler::StaticType LLVMTypeAnalyzer::writeValueType(LLVMInstruction *ins) const
 {
     assert(ins);
     assert(!ins->args.empty());
     const auto arg = ins->args.back().second; // value is always the last argument in variable/list write instructions
     return optimizeRegisterType(arg);
 }
 
-bool LLVMLoopAnalyzer::typesMatch(LLVMInstruction *ins, Compiler::StaticType expectedType) const
+bool LLVMTypeAnalyzer::typesMatch(LLVMInstruction *ins, Compiler::StaticType expectedType) const
 {
     // auto argIns = arg->instruction;
 

…/engine/internal/llvm/llvmloopanalyzer.h …/engine/internal/llvm/llvmtypeanalyzer.hsrc/engine/internal/llvm/llvmloopanalyzer.h renamed to src/engine/internal/llvm/llvmtypeanalyzer.h src/engine/internal/llvm/llvmloopanalyzer.h renamed to src/engine/internal/llvm/llvmtypeanalyzer.h

@@ -9,13 +9,13 @@ struct LLVMVariablePtr;
 struct LLVMInstruction;
 struct LLVMRegister;
 
-class LLVMLoopAnalyzer
+class LLVMTypeAnalyzer
 {
     public:
-        bool variableTypeChanges(LLVMVariablePtr *varPtr, LLVMInstruction *loopBody, Compiler::StaticType preLoopType) const;
+        bool variableTypeChangesInLoop(LLVMVariablePtr *varPtr, LLVMInstruction *loopBody, Compiler::StaticType preLoopType) const;
 
     private:
-        bool variableTypeChangesFromEnd(LLVMVariablePtr *varPtr, LLVMInstruction *loopEnd, Compiler::StaticType preLoopType) const;
+        bool variableTypeChangesInLoopFromEnd(LLVMVariablePtr *varPtr, LLVMInstruction *loopEnd, Compiler::StaticType preLoopType) const;
         bool isLoopStart(LLVMInstruction *ins) const;
         bool isLoopEnd(LLVMInstruction *ins) const;
         bool isIfStart(LLVMInstruction *ins) const;

test/llvm/CMakeLists.txt

@@ -20,7 +20,7 @@ add_executable(
   llvmexecutablecode_test.cpp
   llvmcodebuilder_test.cpp
   llvminstructionlist_test.cpp
-  loop_analyzer/variabletypechanges_test.cpp
+  type_analyzer/variabletypechangesinloop_test.cpp
 )
 
 target_link_libraries(