Commit c41cca4b authored by Kevin Modzelewski's avatar Kevin Modzelewski

Some things to make gcc happy

A couple build issues left though.
parent c129d64d
...@@ -566,7 +566,8 @@ void Rewriter::_decref(RewriterVar* var) { ...@@ -566,7 +566,8 @@ void Rewriter::_decref(RewriterVar* var) {
assembler->decq(assembler::Immediate(&_Py_RefTotal)); assembler->decq(assembler::Immediate(&_Py_RefTotal));
#endif #endif
_setupCall(true, llvm::ArrayRef<RewriterVar*>(&var, 1), llvm::ArrayRef<RewriterVar*>(NULL, (int)0), assembler::RAX); _setupCall(true, llvm::ArrayRef<RewriterVar*>(&var, 1), llvm::ArrayRef<RewriterVar*>(NULL, (size_t)0),
assembler::RAX);
#ifdef Py_REF_DEBUG #ifdef Py_REF_DEBUG
...@@ -601,7 +602,7 @@ void Rewriter::_xdecref(RewriterVar* var) { ...@@ -601,7 +602,7 @@ void Rewriter::_xdecref(RewriterVar* var) {
//assembler->trap(); //assembler->trap();
this->_call(NULL, true, (void*)Helper::xdecref, llvm::ArrayRef<RewriterVar*>(&var, 1), this->_call(NULL, true, (void*)Helper::xdecref, llvm::ArrayRef<RewriterVar*>(&var, 1),
llvm::ArrayRef<RewriterVar*>(NULL, (int)0)); llvm::ArrayRef<RewriterVar*>(NULL, (size_t)0));
// Doesn't call bumpUse, since this function is designed to be callable from other emitting functions. // Doesn't call bumpUse, since this function is designed to be callable from other emitting functions.
// (ie the caller should call bumpUse) // (ie the caller should call bumpUse)
......
...@@ -1145,8 +1145,10 @@ extern "C" void _Py_NegativeRefcount(const char* fname, int lineno, PyObject* op ...@@ -1145,8 +1145,10 @@ extern "C" void _Py_NegativeRefcount(const char* fname, int lineno, PyObject* op
#endif /* Py_REF_DEBUG */ #endif /* Py_REF_DEBUG */
extern "C" int _PyTrash_delete_nesting = 0; extern "C" {
extern "C" PyObject *_PyTrash_delete_later = NULL; int _PyTrash_delete_nesting = 0;
PyObject *_PyTrash_delete_later = NULL;
}
extern "C" void _PyTrash_thread_deposit_object(PyObject* op) noexcept { extern "C" void _PyTrash_thread_deposit_object(PyObject* op) noexcept {
Py_FatalError("unimplemented"); Py_FatalError("unimplemented");
......
...@@ -173,7 +173,7 @@ void addIncrefs(llvm::Value* v, bool nullable, int num_refs, llvm::Instruction* ...@@ -173,7 +173,7 @@ void addIncrefs(llvm::Value* v, bool nullable, int num_refs, llvm::Instruction*
assert(num_refs > 0); assert(num_refs > 0);
llvm::BasicBlock* cur_block; llvm::BasicBlock* cur_block;
llvm::BasicBlock* continue_block; llvm::BasicBlock* continue_block = NULL;
llvm::BasicBlock* incref_block; llvm::BasicBlock* incref_block;
llvm::IRBuilder<true> builder(incref_pt); llvm::IRBuilder<true> builder(incref_pt);
......
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