aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-12-15 21:52:23 -0800
committerIan Lance Taylor <iant@golang.org>2020-12-18 15:56:20 -0800
commit5128f8d0d99008d4f069bbaef9ee4372fe5da7ce (patch)
treea350c80e42f75a90a6ae1196c99486b14df5c1f9 /gcc
parent0e9f2b2dc8df91be27acc383c63f0feae28fa229 (diff)
downloadgcc-5128f8d0d99008d4f069bbaef9ee4372fe5da7ce.zip
gcc-5128f8d0d99008d4f069bbaef9ee4372fe5da7ce.tar.gz
gcc-5128f8d0d99008d4f069bbaef9ee4372fe5da7ce.tar.bz2
compiler: check for floating-point exponent overflow
Adjust mksysinfo and mkrsysinfo to strip out floating-point max numbers, as they can trigger this error. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/278476
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/lex.cc4
-rw-r--r--gcc/testsuite/go.test/test/fixedbugs/issue11326b.go4
-rw-r--r--gcc/testsuite/go.test/test/fixedbugs/issue13471.go22
4 files changed, 20 insertions, 12 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 6567db1..40242cc6 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-526037336231593939a517b7c0b2892d413adb40
+1317de50147304a226b3ec5c4d81376470c358e5
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/lex.cc b/gcc/go/gofrontend/lex.cc
index e71b8cd..0baf4e4 100644
--- a/gcc/go/gofrontend/lex.cc
+++ b/gcc/go/gofrontend/lex.cc
@@ -1316,9 +1316,13 @@ Lex::gather_number()
}
}
+ mpfr_clear_overflow();
mpfr_t val;
int r = mpfr_init_set_str(val, num.c_str(), base, MPFR_RNDN);
go_assert(r == 0);
+ if (mpfr_overflow_p())
+ go_error_at(this->location(),
+ "floating-point exponent too large to represent");
bool is_imaginary = *p == 'i';
if (is_imaginary)
diff --git a/gcc/testsuite/go.test/test/fixedbugs/issue11326b.go b/gcc/testsuite/go.test/test/fixedbugs/issue11326b.go
index 8aba4d9..b5f933b 100644
--- a/gcc/testsuite/go.test/test/fixedbugs/issue11326b.go
+++ b/gcc/testsuite/go.test/test/fixedbugs/issue11326b.go
@@ -1,5 +1,9 @@
// run
+// Does not work with gccgo, which uses a smaller (but still permitted)
+// exponent size.
+// +build !gccgo
+
// Copyright 2015 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
diff --git a/gcc/testsuite/go.test/test/fixedbugs/issue13471.go b/gcc/testsuite/go.test/test/fixedbugs/issue13471.go
index 9bfc8c3..9069412 100644
--- a/gcc/testsuite/go.test/test/fixedbugs/issue13471.go
+++ b/gcc/testsuite/go.test/test/fixedbugs/issue13471.go
@@ -9,17 +9,17 @@
package main
func main() {
- const _ int64 = 1e646456992 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ int32 = 1e64645699 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ int16 = 1e6464569 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ int8 = 1e646456 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ int = 1e64645 // ERROR "integer too large|floating-point constant truncated to integer"
+ const _ int64 = 1e646456992 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ int32 = 1e64645699 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ int16 = 1e6464569 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ int8 = 1e646456 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ int = 1e64645 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
- const _ uint64 = 1e646456992 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ uint32 = 1e64645699 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ uint16 = 1e6464569 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ uint8 = 1e646456 // ERROR "integer too large|floating-point constant truncated to integer"
- const _ uint = 1e64645 // ERROR "integer too large|floating-point constant truncated to integer"
+ const _ uint64 = 1e646456992 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ uint32 = 1e64645699 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ uint16 = 1e6464569 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ uint8 = 1e646456 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
+ const _ uint = 1e64645 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
- const _ rune = 1e64645 // ERROR "integer too large|floating-point constant truncated to integer"
+ const _ rune = 1e64645 // ERROR "integer too large|floating-point constant truncated to integer|exponent too large"
}