From b9b7f048b0874df0f034f6b1e15e1a4ee2131475 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Sun, 26 Jul 2026 12:12:59 +0000 Subject: refactor: centralize libc declarations, move '&' concat into StringHandler CodeGen declares its own MallocFunc in SetupExternalFunctions and uses it for char->STRING coercion and INPUT STRING buffers, removing two bare getFunction("malloc") calls that null-deref'd if no handler happened to declare malloc first. The CHR branch reuses the char->STRING coercion path instead of a second hand-rolled heap wrapper. String concatenation moves from ArithmeticHandler (which re-declared four externs per '&' and was the LLVM 19 build-pin root cause) to StringHandler::emitConcat; ArithmeticHandler no longer touches the Module. Dead FreeFunc declarations removed. Co-Authored-By: Claude Fable 5 --- include/cps/ArrayHandler.h | 1 - include/cps/CodeGen.h | 1 + include/cps/StringHandler.h | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include/cps') diff --git a/include/cps/ArrayHandler.h b/include/cps/ArrayHandler.h index 6f563b7..e8a57fb 100644 --- a/include/cps/ArrayHandler.h +++ b/include/cps/ArrayHandler.h @@ -36,7 +36,6 @@ class ArrayHandler { RuntimeCheck &RuntimeChecker; llvm::FunctionCallee MallocFunc; - llvm::FunctionCallee FreeFunc; llvm::Value *computeFlatIndex(const std::string &Name, const std::vector &Indices); llvm::Value *getArrayBasePointer(const std::string &Name); diff --git a/include/cps/CodeGen.h b/include/cps/CodeGen.h index b1d3831..def7395 100644 --- a/include/cps/CodeGen.h +++ b/include/cps/CodeGen.h @@ -45,6 +45,7 @@ class CodeGen { llvm::FunctionCallee PrintfFunc; llvm::FunctionCallee ScanfFunc; + llvm::FunctionCallee MallocFunc; llvm::Value *PrintfFormatStr; // %lld\n llvm::Value *PrintfFloatFormatStr; // %f\n diff --git a/include/cps/StringHandler.h b/include/cps/StringHandler.h index a31fd2b..7226b85 100644 --- a/include/cps/StringHandler.h +++ b/include/cps/StringHandler.h @@ -14,9 +14,10 @@ class StringHandler { std::map &NamedValues; llvm::FunctionCallee MallocFunc; - llvm::FunctionCallee FreeFunc; llvm::FunctionCallee StrLenFunc; llvm::FunctionCallee MemCpyFunc; + llvm::FunctionCallee StrCpyFunc; + llvm::FunctionCallee StrCatFunc; llvm::FunctionCallee ToUpperFunc; llvm::FunctionCallee ToLowerFunc; @@ -29,6 +30,7 @@ public: llvm::Value *createLiteral(const std::string &Val); llvm::Value *emitLength(llvm::Value *Str); + llvm::Value *emitConcat(llvm::Value *LHS, llvm::Value *RHS); llvm::Value *emitMid(llvm::Value *Str, llvm::Value *Start, llvm::Value *Len); llvm::Value *emitRight(llvm::Value *Str, llvm::Value *Len); llvm::Value *emitLeft(llvm::Value *Str, llvm::Value *Len); -- cgit v1.3.1-4-g156e