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
bc5d666a
Commit
bc5d666a
authored
Apr 12, 2016
by
Marius Wachtler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix small issues encountered when doing OSR
parent
8ce0e0bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
src/codegen/ast_interpreter.cpp
src/codegen/ast_interpreter.cpp
+1
-1
src/codegen/irgen/irgenerator.cpp
src/codegen/irgen/irgenerator.cpp
+2
-1
No files found.
src/codegen/ast_interpreter.cpp
View file @
bc5d666a
...
...
@@ -785,7 +785,7 @@ Box* ASTInterpreter::doOSR(AST_Jump* node) {
=
incref
(
frame_info
.
passed_closure
);
if
(
created_closure
)
sorted_symbol_table
[
source_info
->
getInternedStrings
().
get
(
CREATED_CLOSURE_NAME
)]
=
created_closure
;
sorted_symbol_table
[
source_info
->
getInternedStrings
().
get
(
CREATED_CLOSURE_NAME
)]
=
incref
(
created_closure
)
;
sorted_symbol_table
[
source_info
->
getInternedStrings
().
get
(
FRAME_INFO_PTR_NAME
)]
=
(
Box
*
)
&
frame_info
;
...
...
src/codegen/irgen/irgenerator.cpp
View file @
bc5d666a
...
...
@@ -1057,6 +1057,7 @@ private:
assert
(
exc_info
->
getType
()
==
g
.
llvm_excinfo_type
->
getPointerTo
());
llvm
::
Constant
*
v
=
getNullPtr
(
g
.
llvm_value_type_ptr
);
emitter
.
setType
(
v
,
RefType
::
BORROWED
);
builder
->
CreateStore
(
v
,
builder
->
CreateConstInBoundsGEP2_32
(
exc_info
,
0
,
0
));
builder
->
CreateStore
(
v
,
builder
->
CreateConstInBoundsGEP2_32
(
exc_info
,
0
,
1
));
builder
->
CreateStore
(
v
,
builder
->
CreateConstInBoundsGEP2_32
(
exc_info
,
0
,
2
));
...
...
@@ -2053,7 +2054,7 @@ private:
converted_msg
=
msg
->
makeConverted
(
emitter
,
msg
->
getBoxType
());
llvm_args
.
push_back
(
converted_msg
->
getValue
());
}
else
{
llvm_args
.
push_back
(
getNullPtr
(
g
.
llvm_value_type_ptr
));
llvm_args
.
push_back
(
emitter
.
setType
(
getNullPtr
(
g
.
llvm_value_type_ptr
),
RefType
::
BORROWED
));
}
llvm
::
CallSite
call
=
emitter
.
createCall
(
unw_info
,
g
.
funcs
.
assertFail
,
llvm_args
);
call
.
setDoesNotReturn
();
...
...
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