diff options
| author | Yiran Wang <yiran@google.com> | 2015-06-23 15:33:17 -0700 |
|---|---|---|
| committer | Yiran Wang <yiran@google.com> | 2015-06-29 10:56:28 -0700 |
| commit | 1d9fec7937f45dde5e04cac966a2d9a12f2fc15a (patch) | |
| tree | 3fbcd18a379a05fd6d43491a107e1f36bc61b185 /gcc-4.9/gcc/trans-mem.c | |
| parent | f378ebf14df0952eae870c9865bab8326aa8f137 (diff) | |
| download | toolchain_gcc-1d9fec7937f45dde5e04cac966a2d9a12f2fc15a.tar.gz toolchain_gcc-1d9fec7937f45dde5e04cac966a2d9a12f2fc15a.tar.bz2 toolchain_gcc-1d9fec7937f45dde5e04cac966a2d9a12f2fc15a.zip | |
Synchronize with google/gcc-4_9 to r224707 (from r214835)
Change-Id: I3d6f06fc613c8f8b6a82143dc44b7338483aac5d
Diffstat (limited to 'gcc-4.9/gcc/trans-mem.c')
| -rw-r--r-- | gcc-4.9/gcc/trans-mem.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc-4.9/gcc/trans-mem.c b/gcc-4.9/gcc/trans-mem.c index fe6dc2886..73afb2384 100644 --- a/gcc-4.9/gcc/trans-mem.c +++ b/gcc-4.9/gcc/trans-mem.c @@ -164,6 +164,9 @@ static void *expand_regions (struct tm_region *, static tree get_attrs_for (const_tree x) { + if (x == NULL_TREE) + return NULL_TREE; + switch (TREE_CODE (x)) { case FUNCTION_DECL: @@ -172,16 +175,16 @@ get_attrs_for (const_tree x) default: if (TYPE_P (x)) - return NULL; + return NULL_TREE; x = TREE_TYPE (x); if (TREE_CODE (x) != POINTER_TYPE) - return NULL; + return NULL_TREE; /* FALLTHRU */ case POINTER_TYPE: x = TREE_TYPE (x); if (TREE_CODE (x) != FUNCTION_TYPE && TREE_CODE (x) != METHOD_TYPE) - return NULL; + return NULL_TREE; /* FALLTHRU */ case FUNCTION_TYPE: |