Commit a9b41d55 authored by Kevin Modzelewski's avatar Kevin Modzelewski

Turn off cxx exception interception for now.

Makes the IR much easier to follow.  Also I think the plan will be
to have the cxx unwinder do the refcounting.
parent e1430c45
...@@ -287,7 +287,7 @@ private: ...@@ -287,7 +287,7 @@ private:
if (unw_info.exc_dest == NO_CXX_INTERCEPTION) { if (unw_info.exc_dest == NO_CXX_INTERCEPTION) {
needs_cxx_interception = false; needs_cxx_interception = false;
} else { } else {
bool needs_refcounting_fixup = true; bool needs_refcounting_fixup = false;
needs_cxx_interception = (target_exception_style == CXX && (needs_refcounting_fixup || unw_info.hasHandler() needs_cxx_interception = (target_exception_style == CXX && (needs_refcounting_fixup || unw_info.hasHandler()
|| irstate->getExceptionStyle() == CAPI)); || irstate->getExceptionStyle() == CAPI));
} }
......
...@@ -80,8 +80,8 @@ llvm::Instruction* findIncrefPt(llvm::BasicBlock* BB) { ...@@ -80,8 +80,8 @@ llvm::Instruction* findIncrefPt(llvm::BasicBlock* BB) {
void addIncrefs(llvm::Value* v, int num_refs, llvm::Instruction* incref_pt) { void addIncrefs(llvm::Value* v, int num_refs, llvm::Instruction* incref_pt) {
if (num_refs > 1) { if (num_refs > 1) {
// Not bad but I don't think this should happen: // Not bad but I don't think this should happen:
printf("Whoa more than one incref??\n"); //printf("Whoa more than one incref??\n");
raise(SIGTRAP); //raise(SIGTRAP);
} }
assert(num_refs > 0); assert(num_refs > 0);
......
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