IT CRASHES

WHYYYYYYYYYYYYYYYYYYYYYY

LX-LLVM.vcxproj

@@ -45,6 +45,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
+    <EnableASAN>false</EnableASAN>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>

Main.cpp

@@ -55,6 +55,12 @@ int main(int argc, char** argv)
 
 		// Turns the tokens into an AST
 		LX::FileAST AST = LX::TurnTokensIntoAbstractSyntaxTree(tokens, log.get());
+
+		// Turns the AST into something
+		LX::GenerateIR(AST);
+
+		// Returns success
+		return 0;
 	}
 
 	catch (LX::IncorrectCommandLineArgs)
@@ -104,6 +110,7 @@ int main(int argc, char** argv)
 
 		return 6;
 	}
-
+	
-	return 0;
+	// -1 means an error slipped through (IDK how, it's here just in case)
+	return -1;
 }

Parser/Parser.vcxproj

@@ -131,6 +131,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\AST-Constructors.cpp" />
+    <ClCompile Include="src\AST-LLVM.cpp" />
+    <ClCompile Include="src\GenIR.cpp" />
     <ClCompile Include="src\Parser.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Parser/Parser.vcxproj.filters

@@ -14,5 +14,14 @@
     <ClCompile Include="src\Parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\AST-LLVM.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\AST-Constructors.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\GenIR.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Parser/src/AST-Constructors.cpp

@@ -0,0 +1,16 @@
+#include <Parser.h>
+
+namespace LX::AST
+{
+	NumberLiteral::NumberLiteral(std::string num)
+		: Node(Node::NUMBER_LITERAL), m_Number(num)
+	{}
+
+	Operation::Operation(std::unique_ptr<Node> lhs, Token::TokenType op, std::unique_ptr<Node> rhs)
+		: Node(Node::OPERATION), m_Lhs(std::move(lhs)), m_Operand(op), m_Rhs(std::move(rhs))
+	{}
+
+	ReturnStatement::ReturnStatement(std::unique_ptr<Node> val)
+		: Node(Node::RETURN_STATEMENT), m_Val(std::move(val))
+	{}
+}

Parser/src/AST-LLVM.cpp

@@ -0,0 +1,54 @@
+#include <Parser.h>
+
+#include <LLVM.h>
+#include <Util.h>
+
+namespace LX::AST
+{
+	llvm::Value* NumberLiteral::GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder)
+	{
+		// Converts the string to it's int equivalent
+		// Will eventually need to do floating point stuff here as well
+		int number = std::stoi(m_Number);
+
+		// Returns it as a llvm value (if valid)
+		llvm::Value* out = llvm::ConstantInt::get(llvm::Type::getInt32Ty(context), number, true);
+		ThrowIf<IRGenerationError>(out == nullptr);
+		return out;
+	}
+
+	llvm::Value* Operation::GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder)
+	{
+		// Gets the IR for both sides of the operation
+		llvm::Value* lhs = m_Lhs->GenIR(context, module, builder);
+		llvm::Value* rhs = m_Rhs->GenIR(context, module, builder);
+
+		// If either side is null then return null to prevent invalid IR //
+		if (lhs == nullptr || rhs == nullptr)
+		{
+			ThrowIf<IRGenerationError>(true);
+			return nullptr;
+		}
+
+		// Will eventually get the correct operator but for now everything is add
+		llvm::Value* out = builder.CreateAdd(lhs, rhs);
+		ThrowIf<IRGenerationError>(out == nullptr);
+		return out;
+	}
+
+	llvm::Value* ReturnStatement::GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder)
+	{
+		if (m_Val == nullptr)
+		{
+			ThrowIf<IRGenerationError>(true);
+			return nullptr;
+		}
+
+		else
+		{
+			llvm::Value* out = builder.CreateRet(m_Val->GenIR(context, module, builder));
+			ThrowIf<IRGenerationError>(out == nullptr);
+			return out;
+		}
+	}
+}

Parser/src/GenIR.cpp

@@ -0,0 +1,64 @@
+#include <Parser.h>
+
+#include <iostream>
+
+namespace LX
+{
+	void GenerateIR(FileAST& ast)
+	{
+		// Generates stuff //
+
+		llvm::LLVMContext context;
+		llvm::IRBuilder<> builder(context);
+		
+		{
+			std::unique_ptr<llvm::Module> module = std::make_unique<llvm::Module>("add_ints", context);
+
+			// Defines main function //
+
+			llvm::FunctionType* funcType = llvm::FunctionType::get(llvm::Type::getInt32Ty(context), false);
+			llvm::Function* mainFunc = llvm::Function::Create(funcType, llvm::Function::ExternalLinkage, "main", module.get());
+			llvm::BasicBlock* entry = llvm::BasicBlock::Create(context, "entry", mainFunc);
+			builder.SetInsertPoint(entry);
+
+			// Loops over AST to generate IR //
+
+			for (auto& node : ast.functions[0].body)
+			{
+				switch (node->m_Type)
+				{
+					case AST::Node::RETURN_STATEMENT:
+					{
+						node->GenIR(context, *module, builder);
+						break;
+					}
+
+					default:
+					{
+						break;
+					}
+				}
+			}
+
+			if (entry->getTerminator() == nullptr)
+			{
+				builder.CreateRet(llvm::ConstantInt::get(llvm::Type::getInt32Ty(context), 0, true));
+			}
+
+			// Verification of the IR //
+
+			if (llvm::verifyFunction(*mainFunc, &llvm::errs()) || llvm::verifyModule(*module, &llvm::errs()))
+			{
+				std::cerr << "Error: IR generation failed" << std::endl;
+				return;
+			}
+
+			// Outputs the IR to the console //
+
+			module->print(llvm::outs(), nullptr);
+
+		} // <- Crashes here
+
+		std::cout << "Finished generating IR" << std::endl;
+	}
+}

build-test/Log.txt

@@ -1,17 +0,0 @@
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-Started lexing file
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-Token::FUNCTION
-Token::IDENTIFIER:	main
-Unknown: 3
-Token::NUMBER_LITERAL:	34
-Token::ADD
-Token::NUMBER_LITERAL:	4324
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-Started parsing tokens
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-AST length: 1

build-test/main.lx

@@ -1,2 +1,2 @@
 func main
-    return 34 + 4324
+    return 3 + 4

common/LLVM.h

@@ -2,7 +2,7 @@
 
 // Helper file for including all neccesarry parts of LLVM //
 #ifdef _MSC_VER
-	
+
 	// Disables all warnings as LLVM files have a lot of Data-loss casts that won't cause issues //
 	#pragma warning(push)
 	#pragma warning(disable : 4244)

common/Parser.h

@@ -2,11 +2,13 @@
 
 // Lexer foward declares fstream components so we can use them here //
 #include <Lexer.h>
+#include <LLVM.h>
 
 #include <memory>
 
 // Foward declares all items of the llvm lib that we need //
 // Done to avoid including LLVM.h to shorten compile times //
+/*
 namespace llvm
 {
 	class Value;
@@ -18,7 +20,7 @@ namespace llvm
 
 	template<typename T1 = ConstantFolder, typename T2 = IRBuilderDefaultInserter>
 	class IRBuilder;
-}
+}*/
 
 // The nodes of the abstract syntax tree constructed by the parser from the tokens //
 namespace LX::AST
@@ -65,14 +67,11 @@ namespace LX::AST
 	class NumberLiteral : public Node
 	{
 		public:
-			NumberLiteral(std::string num)
+			// Constructor to set values and automatically set type
-				: Node(Node::NUMBER_LITERAL), m_Number(num)
+			NumberLiteral(std::string num);
-			{}
 
-			llvm::Value* GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder)
+			// Function for generating LLVN IR (Intermediate representation) //
-			{
+			llvm::Value* GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder) override;
-				return nullptr;
-			}
 
 		private:
 			// The number it stores
@@ -85,14 +84,11 @@ namespace LX::AST
 	class Operation : public Node
 	{
 		public:
-			Operation(std::unique_ptr<Node> lhs, Token::TokenType op, std::unique_ptr<Node> rhs)
+			// Constructor to set values and automatically set type
-				: Node(Node::OPERATION), m_Lhs(std::move(lhs)), m_Operand(op), m_Rhs(std::move(rhs))
+			Operation(std::unique_ptr<Node> lhs, Token::TokenType op, std::unique_ptr<Node> rhs);
-			{}
 
-			llvm::Value* GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder)
+			// Function for generating LLVN IR (Intermediate representation) //
-			{
+			llvm::Value* GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder) override;
-				return nullptr;
-			}
 
 		private:
 			// The sides of the operation
@@ -107,14 +103,11 @@ namespace LX::AST
 	class ReturnStatement : public Node
 	{
 		public:
-			ReturnStatement(std::unique_ptr<Node> val)
+			// Constructor to set values and automatically set type
-				: Node(Node::RETURN_STATEMENT), m_Val(std::move(val))
+			ReturnStatement(std::unique_ptr<Node> val);
-			{}
 
-			llvm::Value* GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder)
+			// Function for generating LLVN IR (Intermediate representation) //
-			{
+			llvm::Value* GenIR(llvm::LLVMContext& context, llvm::Module& module, llvm::IRBuilder<>& builder) override;
-				return nullptr;
-			}
 
 		private:
 			// What it is returning (can be null)
@@ -124,6 +117,8 @@ namespace LX::AST
 
 namespace LX
 {
+	struct IRGenerationError {};
+
 	struct FunctionDefinition
 	{
 		FunctionDefinition()
@@ -143,4 +138,6 @@ namespace LX
 	};
 
 	FileAST TurnTokensIntoAbstractSyntaxTree(std::vector<Token>& tokens, std::ofstream* log);
+
+	void GenerateIR(FileAST& ast);
 }