Commit 704ec9a5 authored by Chris Toshok's avatar Chris Toshok

don't introduce g.llvm_boxed_string_type_ptr, just use llvm_value_type_ptr

parent d5d5ace0
......@@ -72,7 +72,7 @@ struct GlobalState {
llvm::Type* llvm_str_type_ptr;
llvm::Type* frame_info_type;
llvm::Type* llvm_clfunction_type_ptr, *llvm_closure_type_ptr, *llvm_generator_type_ptr;
llvm::Type* llvm_module_type_ptr, *llvm_bool_type_ptr, *llvm_boxed_string_type_ptr;
llvm::Type* llvm_module_type_ptr, *llvm_bool_type_ptr;
llvm::Type* llvm_excinfo_type;
llvm::Type* i1, *i8, *i8_ptr, *i32, *i64, *void_, *double_;
llvm::Type* vector_ptr;
......
......@@ -1013,9 +1013,8 @@ private:
CompilerVariable* evalStr(AST_Str* node, UnwindInfo unw_info) {
if (node->str_type == AST_Str::STR) {
llvm::Value* rtn
= embedConstantPtr(irstate->getSourceInfo()->parent_module->getStringConstant(node->str_data),
g.llvm_boxed_string_type_ptr);
llvm::Value* rtn = embedConstantPtr(
irstate->getSourceInfo()->parent_module->getStringConstant(node->str_data), g.llvm_value_type_ptr);
return new ConcreteCompilerVariable(STR, rtn, true);
......
......@@ -153,9 +153,6 @@ void initGlobalFuncs(GlobalState& g) {
g.frame_info_type = g.stdlib_module->getTypeByName("struct.pyston::FrameInfo");
assert(g.frame_info_type);
g.llvm_boxed_string_type_ptr = g.stdlib_module->getTypeByName("class.pyston::BoxedString")->getPointerTo();
assert(g.llvm_boxed_string_type_ptr);
#define GET(N) g.funcs.N = getFunc((void*)N, STRINGIFY(N))
g.funcs.printf = addFunc((void*)printf, g.i8_ptr, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment