Skip to content

Fix complex(real, imag) converting imag before checking real #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jseop-lim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix complex(real, imag) converting imag before checking real #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions graalpython/com.oracle.graal.python.test/src/tests/test_complex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,20 @@ class SubComplex(complex):
assert result == 2 + 3j
assert type(result) is complex


def test_create_checks_arguments_before_converting():
class RaisingReal:
def __float__(self):
raise KeyError

class RaisingImag:
def __float__(self):
raise RuntimeError

assert_raises(TypeError, complex, {}, RaisingImag())
assert_raises(TypeError, complex, RaisingReal(), {})
assert_raises(KeyError, complex, RaisingReal(), RaisingImag())

class ComplexTest(unittest.TestCase):

def assertAlmostEqual(self, a, b):
Expand Down
22 changes: 9 additions & 13 deletions ...le.graal.python/src/com/oracle/graal/python/builtins/objects/complex/ComplexBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,21 +618,17 @@ Object complexFromComplexObject(VirtualFrame frame, Object cls, Object one, Obje
@Cached.Shared("tryComplex") @Cached TryComplexSpecialMethodNode tryComplexNode,
@Cached.Shared @Cached PRaiseNode raiseNode) {
PComplex oneValue = getComplexNumberFromObject(frame, one, inliningTarget, isComplexType, tryComplexNode);
if (canBeDoubleNode.execute(inliningTarget, two)) {
double twoValue = asDoubleNode.execute(frame, inliningTarget, two);
if (oneValue == null) {
if (one == PNone.NO_VALUE) {
return createComplexNode.execute(inliningTarget, cls, 0, twoValue);
} else if (canBeDoubleNode.execute(inliningTarget, one)) {
return createComplexNode.execute(inliningTarget, cls, asDoubleNode.execute(frame, inliningTarget, one), twoValue);
} else {
throw raiseFirstArgError(one, inliningTarget, raiseNode);
}
}
return createComplexNode.execute(inliningTarget, cls, oneValue.getReal(), oneValue.getImag() + twoValue);
} else {
if (oneValue == null && one != PNone.NO_VALUE && !canBeDoubleNode.execute(inliningTarget, one)) {
throw raiseFirstArgError(one, inliningTarget, raiseNode);
}
if (!canBeDoubleNode.execute(inliningTarget, two)) {
throw raiseSecondArgError(two, inliningTarget, raiseNode);
}
if (oneValue == null) {
double oneDouble = one == PNone.NO_VALUE ? 0 : asDoubleNode.execute(frame, inliningTarget, one);
return createComplexNode.execute(inliningTarget, cls, oneDouble, asDoubleNode.execute(frame, inliningTarget, two));
}
return createComplexNode.execute(inliningTarget, cls, oneValue.getReal(), oneValue.getImag() + asDoubleNode.execute(frame, inliningTarget, two));
}

@Specialization
Expand Down