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
0d111f89
Commit
0d111f89
authored
May 23, 2016
by
Kevin Modzelewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Loosen these checks if we imported a third party c extension
parent
026b316f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
src/runtime/objmodel.cpp
src/runtime/objmodel.cpp
+3
-2
No files found.
src/runtime/objmodel.cpp
View file @
0d111f89
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
#include "runtime/generator.h"
#include "runtime/generator.h"
#include "runtime/hiddenclass.h"
#include "runtime/hiddenclass.h"
#include "runtime/ics.h"
#include "runtime/ics.h"
#include "runtime/import.h"
#include "runtime/iterobject.h"
#include "runtime/iterobject.h"
#include "runtime/long.h"
#include "runtime/long.h"
#include "runtime/rewrite_args.h"
#include "runtime/rewrite_args.h"
...
@@ -4964,7 +4965,7 @@ Box* callCLFunc(FunctionMetadata* md, CallRewriteArgs* rewrite_args, int num_out
...
@@ -4964,7 +4965,7 @@ Box* callCLFunc(FunctionMetadata* md, CallRewriteArgs* rewrite_args, int num_out
// We check for this assertion later too - by checking it twice, we know
// We check for this assertion later too - by checking it twice, we know
// if the error state was set before calling the chosen CF or after.
// if the error state was set before calling the chosen CF or after.
ASSERT
(
!
PyErr_Occurred
(),
""
);
ASSERT
(
imported_foreign_cextension
||
!
PyErr_Occurred
(),
""
);
Box
*
r
;
Box
*
r
;
// we duplicate the call to callChosenCf here so we can
// we duplicate the call to callChosenCf here so we can
...
@@ -4989,7 +4990,7 @@ Box* callCLFunc(FunctionMetadata* md, CallRewriteArgs* rewrite_args, int num_out
...
@@ -4989,7 +4990,7 @@ Box* callCLFunc(FunctionMetadata* md, CallRewriteArgs* rewrite_args, int num_out
ASSERT
(
chosen_cf
->
spec
->
rtn_type
->
isFitBy
(
r
->
cls
),
"%s (%p) was supposed to return %s, but gave a %s"
,
ASSERT
(
chosen_cf
->
spec
->
rtn_type
->
isFitBy
(
r
->
cls
),
"%s (%p) was supposed to return %s, but gave a %s"
,
g
.
func_addr_registry
.
getFuncNameAtAddress
(
chosen_cf
->
code
,
true
,
NULL
).
c_str
(),
chosen_cf
->
code
,
g
.
func_addr_registry
.
getFuncNameAtAddress
(
chosen_cf
->
code
,
true
,
NULL
).
c_str
(),
chosen_cf
->
code
,
chosen_cf
->
spec
->
rtn_type
->
debugName
().
c_str
(),
r
->
cls
->
tp_name
);
chosen_cf
->
spec
->
rtn_type
->
debugName
().
c_str
(),
r
->
cls
->
tp_name
);
ASSERT
(
!
PyErr_Occurred
(),
"%p"
,
chosen_cf
->
code
);
ASSERT
(
imported_foreign_cextension
||
!
PyErr_Occurred
(),
"%p"
,
chosen_cf
->
code
);
}
}
return
r
;
return
r
;
...
...
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