From 02effee6a9224b531cb3fe6eac8278b46b9fbe86 Mon Sep 17 00:00:00 2001
From: Jack Palevich <jackpal@google.com>
Date: Mon, 9 Nov 2009 12:52:45 +0800
Subject: [PATCH] Correctly compute the type of an assignment expression.
This change enables following types of statements to work correctly:
a = b = 3;
if ((a = getchar()) < 0) { ... }
This fixes 2232082 acc: assignment in comparison segfaults
---
libacc/acc.cpp | 2 ++
libacc/tests/data/assignment.c | 9 +++++++++
libacc/tests/test.py | 5 +++++
3 files changed, 16 insertions(+)
create mode 100644 libacc/tests/data/assignment.c
diff --git a/libacc/acc.cpp b/libacc/acc.cpp
index 6d9213c74c..808752e307 100644
--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -1666,6 +1666,7 @@ class Compiler : public ErrorSink {
pDestType->tag);
break;
}
+ setR0Type(pDestType);
}
virtual void loadR0FromR0() {
@@ -2836,6 +2837,7 @@ class Compiler : public ErrorSink {
pTargetType->tag);
break;
}
+ setR0Type(pTargetType);
}
virtual void loadR0FromR0() {
diff --git a/libacc/tests/data/assignment.c b/libacc/tests/data/assignment.c
new file mode 100644
index 0000000000..4fc7801d0a
--- /dev/null
+++ b/libacc/tests/data/assignment.c
@@ -0,0 +1,9 @@
+int main() {
+ int a = 0;
+ int b = 1;
+ a = b = 2; // Test that "b = 2" generates an rvalue.
+ if (a = 7) { // Test that a = 7 generates an rvalue.
+ b = 3;
+ }
+ return a;
+}
diff --git a/libacc/tests/test.py b/libacc/tests/test.py
index c982d16c36..d984301116 100644
--- a/libacc/tests/test.py
+++ b/libacc/tests/test.py
@@ -424,6 +424,11 @@ result: 0
def testShort(self):
self.compileCheck(["-R", "data/short.c"], """Executing compiled code:
result: -2
+""","""""")
+
+ def testAssignment(self):
+ self.compileCheck(["-R", "data/assignment.c"], """Executing compiled code:
+result: 7
""","""""")
def testArray(self):
--
GitLab