diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/text/template/exec.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index a8bc62c..8a0c76f 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -672db63f342c99bdc7ed46f040038440f429e600 +3b9c57a35370f26e6cf5839084e367e75e45ec97 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/text/template/exec.go b/libgo/go/text/template/exec.go index 7cf7bb6..c7c6d50 100644 --- a/libgo/go/text/template/exec.go +++ b/libgo/go/text/template/exec.go @@ -19,9 +19,9 @@ import ( // templates. This limit is only practically reached by accidentally // recursive template invocations. This limit allows us to return // an error instead of triggering a stack overflow. -// For gccgo we make this 10000 rather than 100000 to avoid stack overflow +// For gccgo we make this 1000 rather than 100000 to avoid stack overflow // on non-split-stack systems. -const maxExecDepth = 10000 +const maxExecDepth = 1000 // state represents the state of an execution. It's not part of the // template so that multiple executions of the same template |