libgo: Update to weekly.2012-01-20.

[pf3gnuchains/gcc-fork.git] / libgo / go / text / template / template.go

diff --git a/libgo/go/text/template/template.go b/libgo/go/text/template/template.go
index cbc6808..87e39d3 100644 (file)
--- a/libgo/go/text/template/template.go
+++ b/libgo/go/text/template/template.go
@@ -198,7 +198,7 @@ func (t *Template) associate(new *Template) error {
        name := new.name
        if old := t.tmpl[name]; old != nil {
                oldIsEmpty := parse.IsEmptyTree(old.Root)
-               newIsEmpty := parse.IsEmptyTree(new.Root)
+               newIsEmpty := new.Tree != nil && parse.IsEmptyTree(new.Root)
                if !oldIsEmpty && !newIsEmpty {
                        return fmt.Errorf("template: redefinition of template %q", name)
                }