diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-22 15:22:04 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-22 15:22:04 +0000 |
| commit | 79e0cff74052972ae3794cdb4791864d406d16ec (patch) | |
| tree | 21b476dfc623e3356f62e5f133c7927ccbfccdc1 /gcc/lto-streamer-out.c | |
| parent | 84972db5b3f112ca1c838dc3bd7b2f333b99adea (diff) | |
| download | gcc-79e0cff74052972ae3794cdb4791864d406d16ec.tar.gz | |
2012-09-22 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 191642 using svnmerge.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@191643 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/lto-streamer-out.c')
| -rw-r--r-- | gcc/lto-streamer-out.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index 2adae7445a2..709eb60ce38 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -155,6 +155,7 @@ lto_output_location_bitpack (struct bitpack_d *bp, { expanded_location xloc; + loc = LOCATION_LOCUS (loc); bp_pack_value (bp, loc == UNKNOWN_LOCATION, 1); if (loc == UNKNOWN_LOCATION) return; @@ -796,7 +797,6 @@ output_function (struct cgraph_node *node) gcc_assert (current_function_decl == NULL_TREE && cfun == NULL); /* Set current_function_decl and cfun. */ - current_function_decl = function; push_cfun (fn); /* Make string 0 be a NULL string. */ @@ -850,7 +850,6 @@ output_function (struct cgraph_node *node) destroy_output_block (ob); - current_function_decl = NULL; pop_cfun (); } |