Use unsafe constants from CompilerContext

Author: adazem009

src/engine/internal/codegen/llvm/llvmbuildutils.cpp

@@ -42,35 +42,6 @@ LLVMBuildUtils::LLVMBuildUtils(LLVMCompilerContext *ctx, llvm::IRBuilder<> &buil
     initTypes();
     createVariableMap();
     createListMap();
-
-    // Find unsafe numeric string constants in costume and sound names
-    if (m_target) {
-        IEngine *engine = m_target->engine();
-
-        if (engine) {
-            auto checkConstant = [this](const std::string &str) {
-                Value stringValue(str);
-                Value numberValue(stringValue.toDouble());
-
-                if (stringValue.isValidNumber() && str == numberValue.toString())
-                    m_unsafeConstants.insert(str);
-            };
-
-            const auto &targets = engine->targets();
-            bool found = false;
-
-            for (const auto &target : targets) {
-                const auto &costumes = target->costumes();
-                const auto &sounds = target->sounds();
-
-                for (const auto &costume : costumes)
-                    checkConstant(costume->name());
-
-                for (const auto &sound : sounds)
-                    checkConstant(sound->name());
-            }
-        }
-    }
 }
 
 void LLVMBuildUtils::init(llvm::Function *function, BlockPrototype *procedurePrototype, bool warp, const std::vector<std::shared_ptr<LLVMRegister>> &regs)
@@ -522,7 +493,9 @@ Compiler::StaticType LLVMBuildUtils::optimizeRegisterType(const LLVMRegister *re
         std::string str = value.toString();
 
         // Apply this optimization only if the number matches the string and the constant is safe
-        if (value.isValidNumber() && numberValue.toString() == str && m_unsafeConstants.find(str) == m_unsafeConstants.cend())
+        const auto &unsafeConstants = m_ctx->unsafeConstants();
+
+        if (value.isValidNumber() && numberValue.toString() == str && unsafeConstants.find(str) == unsafeConstants.cend())
             ret = Compiler::StaticType::Number;
     }
 

src/engine/internal/codegen/llvm/llvmbuildutils.h

@@ -180,8 +180,6 @@ class LIBSCRATCHCPP_TEST_EXPORT LLVMBuildUtils
         bool m_warp = false;
         Compiler::CodeType m_codeType = Compiler::CodeType::Script;
 
-        std::unordered_set<std::string> m_unsafeConstants;
-
         llvm::Value *m_executionContextPtr = nullptr;
         llvm::Value *m_targetPtr = nullptr;
         llvm::Value *m_targetVariables = nullptr;

test/llvm/code_analyzer/list_type_analysis.cpp

@@ -1,7 +1,5 @@
 #include <scratchcpp/project.h>
-#include <scratchcpp/sprite.h>
-#include <scratchcpp/costume.h>
-#include <scratchcpp/sound.h>
+#include <scratchcpp/target.h>
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/list.h>
 #include <engine/internal/codegen/llvm/llvmcodeanalyzer.h>
@@ -22,17 +20,11 @@ class LLVMCodeAnalyzer_ListTypeAnalysis : public testing::Test
         {
             auto engine = m_project.engine();
             m_target = std::make_shared<Target>();
-            m_spriteWithUnsafeConstants = std::make_shared<Sprite>();
 
-            auto costume = std::make_shared<Costume>(m_unsafeCostumeNumConstant, "", "");
-            m_spriteWithUnsafeConstants->addCostume(costume);
+            engine->setTargets({ m_target });
 
-            auto sound = std::make_shared<Sound>(m_unsafeSoundNumConstant, "", "");
-            m_spriteWithUnsafeConstants->addSound(sound);
-
-            engine->setTargets({ m_target, m_spriteWithUnsafeConstants });
-
-            m_ctx = std::make_unique<LLVMCompilerContext>(engine.get(), m_target.get());
+            const std::unordered_set<std::string> unsafeConstants = { m_unsafeCostumeNumConstant, m_unsafeSoundNumConstant };
+            m_ctx = std::make_unique<LLVMCompilerContext>(engine.get(), m_target.get(), unsafeConstants);
             m_builder = std::make_unique<llvm::IRBuilder<>>(*m_ctx->llvmCtx());
             m_utils = std::make_unique<LLVMBuildUtils>(m_ctx.get(), *m_builder, Compiler::CodeType::Script);
             m_analyzer = std::make_unique<LLVMCodeAnalyzer>(*m_utils);

test/llvm/code_analyzer/variable_type_analysis.cpp

@@ -1,7 +1,5 @@
 #include <scratchcpp/project.h>
-#include <scratchcpp/sprite.h>
-#include <scratchcpp/costume.h>
-#include <scratchcpp/sound.h>
+#include <scratchcpp/target.h>
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/variable.h>
 #include <engine/internal/codegen/llvm/llvmcodeanalyzer.h>
@@ -22,17 +20,11 @@ class LLVMCodeAnalyzer_VariableTypeAnalysis : public testing::Test
         {
             auto engine = m_project.engine();
             m_target = std::make_shared<Target>();
-            m_spriteWithUnsafeConstants = std::make_shared<Sprite>();
 
-            auto costume = std::make_shared<Costume>(m_unsafeCostumeNumConstant, "", "");
-            m_spriteWithUnsafeConstants->addCostume(costume);
+            engine->setTargets({ m_target });
 
-            auto sound = std::make_shared<Sound>(m_unsafeSoundNumConstant, "", "");
-            m_spriteWithUnsafeConstants->addSound(sound);
-
-            engine->setTargets({ m_target, m_spriteWithUnsafeConstants });
-
-            m_ctx = std::make_unique<LLVMCompilerContext>(engine.get(), m_target.get());
+            const std::unordered_set<std::string> unsafeConstants = { m_unsafeCostumeNumConstant, m_unsafeSoundNumConstant };
+            m_ctx = std::make_unique<LLVMCompilerContext>(engine.get(), m_target.get(), unsafeConstants);
             m_builder = std::make_unique<llvm::IRBuilder<>>(*m_ctx->llvmCtx());
             m_utils = std::make_unique<LLVMBuildUtils>(m_ctx.get(), *m_builder, Compiler::CodeType::Script);
             m_analyzer = std::make_unique<LLVMCodeAnalyzer>(*m_utils);
@@ -47,7 +39,6 @@ class LLVMCodeAnalyzer_VariableTypeAnalysis : public testing::Test
     private:
         Project m_project;
         std::shared_ptr<Target> m_target;
-        std::shared_ptr<Sprite> m_spriteWithUnsafeConstants;
         std::unique_ptr<LLVMCompilerContext> m_ctx;
         std::unique_ptr<llvm::IRBuilder<>> m_builder;
         std::unique_ptr<LLVMBuildUtils> m_utils;