aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/integrate.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52af714..829318e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-18 Gavin Romig-Koch <gavin@cygnus.com>
+
+ * integrate.c (expand_inline_function): Add necessary check for NULL.
+
1999-11-18 Nick Clifton <nickc@cygnus.com>
* toplev.c (main): Correctly detect an unrecognised option.
diff --git a/gcc/integrate.c b/gcc/integrate.c
index 30f9ed0..adf03cc 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -1342,7 +1342,8 @@ expand_inline_function (fndecl, parms, target, ignore, type,
/* If the function returns a BLKmode object in a register, copy it
out of the temp register into a BLKmode memory object. */
- if (TYPE_MODE (TREE_TYPE (TREE_TYPE (fndecl))) == BLKmode
+ if (target
+ && TYPE_MODE (TREE_TYPE (TREE_TYPE (fndecl))) == BLKmode
&& ! aggregate_value_p (TREE_TYPE (TREE_TYPE (fndecl))))
target = copy_blkmode_from_reg (0, target, TREE_TYPE (TREE_TYPE (fndecl)));