aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2013-02-05 01:11:01 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2013-02-05 01:11:01 +0000
commitea99f6314dfb7dafa574c27bbee9f4fdef235129 (patch)
treed18d67fd2cdfd72cc601609c2ecb3331d2c47493 /gcc
parent40b251cc38812ac00010a9892ac57fa3ae3c7c86 (diff)
downloadgcc-ea99f6314dfb7dafa574c27bbee9f4fdef235129.zip
gcc-ea99f6314dfb7dafa574c27bbee9f4fdef235129.tar.gz
gcc-ea99f6314dfb7dafa574c27bbee9f4fdef235129.tar.bz2
re PR bootstrap/56198 (Go profiledbootstrap error)
PR bootstrap/56198 compiler: Always initialize *nested_off in interpret_header. From-SVN: r195747
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/import-archive.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/import-archive.cc b/gcc/go/gofrontend/import-archive.cc
index 032c6a0..9a1d5b3 100644
--- a/gcc/go/gofrontend/import-archive.cc
+++ b/gcc/go/gofrontend/import-archive.cc
@@ -277,6 +277,7 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off,
return false;
}
+ *nested_off = 0;
if (hdr->ar_name[0] != '/')
{
const char* name_end = strchr(hdr->ar_name, '/');
@@ -288,7 +289,6 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off,
return false;
}
pname->assign(hdr->ar_name, name_end - hdr->ar_name);
- *nested_off = 0;
}
else if (hdr->ar_name[1] == ' ')
{
@@ -327,8 +327,7 @@ Archive_file::interpret_header(const Archive_header* hdr, off_t off,
return false;
}
pname->assign(name, name_end - 1 - name);
- if (nested_off != NULL)
- *nested_off = y;
+ *nested_off = y;
}
return true;