Commit 280b774e authored by Kevin Modzelewski's avatar Kevin Modzelewski

New clang-format results

parent 02712d79
...@@ -364,7 +364,7 @@ check: ...@@ -364,7 +364,7 @@ check:
$(MAKE) check_dbg $(MAKE) check_dbg
# $(MAKE) check_format $(MAKE) check_format
$(MAKE) run_unittests $(MAKE) run_unittests
@# jit_prof forces the use of GCC as the compiler, which can expose other errors, so just build it and see what happens: @# jit_prof forces the use of GCC as the compiler, which can expose other errors, so just build it and see what happens:
......
...@@ -146,7 +146,7 @@ public: ...@@ -146,7 +146,7 @@ public:
#else #else
++I ++I
#endif #endif
) { ) {
llvm::object::section_iterator section(Obj.end_sections()); llvm::object::section_iterator section(Obj.end_sections());
code = I->getSection(section); code = I->getSection(section);
assert(!code); assert(!code);
...@@ -173,7 +173,7 @@ public: ...@@ -173,7 +173,7 @@ public:
} }
}; };
GlobalState::GlobalState() : context(llvm::getGlobalContext()) {}; GlobalState::GlobalState() : context(llvm::getGlobalContext()){};
llvm::JITEventListener* makeRegistryListener() { llvm::JITEventListener* makeRegistryListener() {
return new RegistryEventListener(); return new RegistryEventListener();
......
...@@ -126,7 +126,7 @@ public: ...@@ -126,7 +126,7 @@ public:
#endif #endif
#if LLVMREV < 215566 #if LLVMREV < 215566
virtual llvm::MemoryBuffer* getObject(const llvm::Module* M) { virtual llvm::MemoryBuffer* getObject(const llvm::Module* M){
#else #else
virtual std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* M) { virtual std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* M) {
#endif #endif
......
...@@ -1862,7 +1862,7 @@ private: ...@@ -1862,7 +1862,7 @@ private:
// prevent us from having two OSR exits point to the same OSR entry; not something that // prevent us from having two OSR exits point to the same OSR entry; not something that
// we're doing right now but something that would be nice in the future. // we're doing right now but something that would be nice in the future.
llvm::Value* arg_array = NULL, *malloc_save = NULL; llvm::Value* arg_array = NULL, * malloc_save = NULL;
if (sorted_symbol_table.size() > 3) { if (sorted_symbol_table.size() > 3) {
// Leave in the ability to use malloc but I guess don't use it. // Leave in the ability to use malloc but I guess don't use it.
// Maybe if there are a ton of live variables it'd be nice to have them be // Maybe if there are a ton of live variables it'd be nice to have them be
......
...@@ -675,15 +675,14 @@ Box* interpretFunction(llvm::Function* f, int nargs, Box* closure, Box* generato ...@@ -675,15 +675,14 @@ Box* interpretFunction(llvm::Function* f, int nargs, Box* closure, Box* generato
break; break;
case 0b1000000000: // 512 case 0b1000000000: // 512
r = reinterpret_cast<int64_t (*)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, r = reinterpret_cast<int64_t (*)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t,
int64_t, int64_t)>(f)(args[0].n, args[1].n, args[2].n, int64_t, int64_t)>(f)(
args[3].n, args[4].n, args[5].n, args[0].n, args[1].n, args[2].n, args[3].n, args[4].n, args[5].n, args[6].n, args[7].n);
args[6].n, args[7].n);
break; break;
case 0b10000000000: // 1024 case 0b10000000000: // 1024
r = reinterpret_cast<int64_t (*)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, r = reinterpret_cast<int64_t (*)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t,
int64_t, int64_t, int64_t)>( int64_t, int64_t, int64_t)>(f)(
f)(args[0].n, args[1].n, args[2].n, args[3].n, args[4].n, args[5].n, args[6].n, args[0].n, args[1].n, args[2].n, args[3].n, args[4].n, args[5].n, args[6].n, args[7].n,
args[7].n, args[8].n); args[8].n);
break; break;
default: default:
inst->dump(); inst->dump();
......
...@@ -197,5 +197,5 @@ FunctionPass* createConstClassesPass() { ...@@ -197,5 +197,5 @@ FunctionPass* createConstClassesPass() {
} }
static RegisterPass<pyston::ConstClassesPass> static RegisterPass<pyston::ConstClassesPass>
X("const_classes", "Use the fact that builtin classes are constant and their attributes can be constant-folded", true, X("const_classes", "Use the fact that builtin classes are constant and their attributes can be constant-folded",
false); true, false);
...@@ -394,7 +394,7 @@ public: ...@@ -394,7 +394,7 @@ public:
virtual void accept(ASTVisitor* v); virtual void accept(ASTVisitor* v);
virtual void accept_stmt(StmtVisitor* v); virtual void accept_stmt(StmtVisitor* v);
AST_Delete() : AST_stmt(AST_TYPE::Delete) {}; AST_Delete() : AST_stmt(AST_TYPE::Delete){};
static const AST_TYPE::AST_TYPE TYPE = AST_TYPE::Delete; static const AST_TYPE::AST_TYPE TYPE = AST_TYPE::Delete;
}; };
......
...@@ -1846,8 +1846,8 @@ public: ...@@ -1846,8 +1846,8 @@ public:
push_back(makeExpr(enter)); push_back(makeExpr(enter));
} }
CFGBlock* continue_dest = NULL, *break_dest = NULL; CFGBlock* continue_dest = NULL, * break_dest = NULL;
CFGBlock* orig_continue_dest = NULL, *orig_break_dest = NULL; CFGBlock* orig_continue_dest = NULL, * orig_break_dest = NULL;
if (loops.size()) { if (loops.size()) {
continue_dest = cfg->addDeferredBlock(); continue_dest = cfg->addDeferredBlock();
continue_dest->info = "with_continue"; continue_dest->info = "with_continue";
......
...@@ -68,11 +68,11 @@ struct Stats { ...@@ -68,11 +68,11 @@ struct Stats {
}; };
struct StatCounter { struct StatCounter {
StatCounter(const char* name) {} StatCounter(const char* name) {}
void log(int count = 1) {}; void log(int count = 1){};
}; };
struct StatPerThreadCounter { struct StatPerThreadCounter {
StatPerThreadCounter(const char* name) {} StatPerThreadCounter(const char* name) {}
void log(int count = 1) {}; void log(int count = 1){};
}; };
#endif #endif
} }
......
...@@ -227,7 +227,7 @@ public: ...@@ -227,7 +227,7 @@ public:
SourceInfo* source; SourceInfo* source;
FunctionList FunctionList
versions; // any compiled versions along with their type parameters; in order from most preferred to least versions; // any compiled versions along with their type parameters; in order from most preferred to least
std::unordered_map<const OSREntryDescriptor*, CompiledFunction*> osr_versions; std::unordered_map<const OSREntryDescriptor*, CompiledFunction*> osr_versions;
// Functions can provide an "internal" version, which will get called instead // Functions can provide an "internal" version, which will get called instead
......
...@@ -2324,7 +2324,7 @@ Box* callFunc(BoxedFunction* func, CallRewriteArgs* rewrite_args, ArgPassSpec ar ...@@ -2324,7 +2324,7 @@ Box* callFunc(BoxedFunction* func, CallRewriteArgs* rewrite_args, ArgPassSpec ar
} }
// The "output" args that we will pass to the called function: // The "output" args that we will pass to the called function:
Box* oarg1 = NULL, *oarg2 = NULL, *oarg3 = NULL; Box* oarg1 = NULL, * oarg2 = NULL, * oarg3 = NULL;
Box** oargs = NULL; Box** oargs = NULL;
if (num_output_args > 3) { if (num_output_args > 3) {
......
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