Small fixes

src/codegen/ast_interpreter.cpp

@@ -575,7 +575,7 @@ Value ASTInterpreter::visit_yield(AST_Yield* node) {
     return yield(generator, value.o);
 }
 
-Value __attribute__((flatten)) ASTInterpreter::visit_stmt(AST_stmt* node) {
+Value ASTInterpreter::visit_stmt(AST_stmt* node) {
     if (0) {
         printf("%20s % 2d ", source_info->getName().c_str(), current_block->idx);
         print_ast(node);
@@ -833,7 +833,7 @@ Value ASTInterpreter::visit_compare(AST_Compare* node) {
     return doBinOp(visit_expr(node->left).o, visit_expr(node->comparators[0]).o, node->ops[0], BinExpType::Compare);
 }
 
-Value __attribute__((flatten)) ASTInterpreter::visit_expr(AST_expr* node) {
+Value ASTInterpreter::visit_expr(AST_expr* node) {
     switch (node->type) {
         case AST_TYPE::Attribute:
             return visit_attribute((AST_Attribute*)node);

src/core/options.cpp

@@ -64,5 +64,7 @@ bool ENABLE_RUNTIME_ICS = 1 && _GLOBAL_ENABLE;
 bool ENABLE_FRAME_INTROSPECTION = 1;
 bool BOOLS_AS_I64 = ENABLE_FRAME_INTROSPECTION;
 
-extern "C" int Py_IgnoreEnvironmentFlag = 1;
+extern "C" {
+int Py_IgnoreEnvironmentFlag = 1;
+}
 }

src/core/stringpool.h

@@ -132,7 +132,8 @@ template <> struct less<pyston::InternedString> {
 };
 }
 
-template <> struct llvm::DenseMapInfo<pyston::InternedString> {
+namespace llvm {
+template <> struct DenseMapInfo<pyston::InternedString> {
     static inline pyston::InternedString getEmptyKey() { return pyston::InternedString(); }
     static inline pyston::InternedString getTombstoneKey() {
         pyston::InternedString str;
@@ -145,5 +146,6 @@ template <> struct llvm::DenseMapInfo<pyston::InternedString> {
         return lhs._str == rhs._str;
     }
 };
+}
 
 #endif