Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pyston
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
Pyston
Commits
b00e7a93
Commit
b00e7a93
authored
Mar 14, 2016
by
Marius Wachtler
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
llvm tier: call deinitFrame when in CAPI mode and returning an exception
parent
7b941863
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
src/codegen/irgen/irgenerator.cpp
src/codegen/irgen/irgenerator.cpp
+1
-0
test/tests/exceptions_test2.py
test/tests/exceptions_test2.py
+12
-0
No files found.
src/codegen/irgen/irgenerator.cpp
View file @
b00e7a93
...
@@ -3058,6 +3058,7 @@ public:
...
@@ -3058,6 +3058,7 @@ public:
// just not created an Invoke and let the exception machinery propagate it for us.
// just not created an Invoke and let the exception machinery propagate it for us.
assert
(
irstate
->
getExceptionStyle
()
==
CAPI
);
assert
(
irstate
->
getExceptionStyle
()
==
CAPI
);
builder
->
CreateCall3
(
g
.
funcs
.
PyErr_Restore
,
exc_type
,
exc_value
,
exc_traceback
);
builder
->
CreateCall3
(
g
.
funcs
.
PyErr_Restore
,
exc_type
,
exc_value
,
exc_traceback
);
builder
->
CreateCall
(
g
.
funcs
.
deinitFrame
,
irstate
->
getFrameInfoVar
());
builder
->
CreateRet
(
getNullPtr
(
g
.
llvm_value_type_ptr
));
builder
->
CreateRet
(
getNullPtr
(
g
.
llvm_value_type_ptr
));
}
}
...
...
test/tests/exceptions_test2.py
0 → 100644
View file @
b00e7a93
# this test caused crashes because of a missing deinitFrame call in the LLVM tier when compiling funcs in CAPI mode
def
next
(
x
):
1
/
x
def
foo
(
x
):
try
:
next
(
x
)
except
Exception
as
e
:
print
"exc"
,
e
foo
(
1
)
foo
(
0
)
Boxiang Sun
@Daetalus
mentioned in commit
e5bb961d
·
Sep 08, 2016
mentioned in commit
e5bb961d
mentioned in commit e5bb961da07737ca58a79adb4ed5605323fa54bf
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment