diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a238cac62a66..9aeeadbec52a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-13  Aldy Hernandez  <aldyh@redhat.com>
+
+	PR tree-optimization/59149
+	* calls.c (flags_from_decl_or_type): Fail on non decl or type.
+	* trans-mem.c (diagnose_tm_1): Do not call flags_from_decl_or_type
+	if no type or decl.
+
 2013-12-13  Kenneth Zadeck  <zadeck@naturalbridge.com>
 
 	* config/arc/arc.h (BITS_PER_UNIT): Removed.
diff --git a/gcc/calls.c b/gcc/calls.c
index 3963bc297547..2226e78a4894 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -769,6 +769,8 @@ flags_from_decl_or_type (const_tree exp)
 	      || lookup_attribute ("transaction_pure", TYPE_ATTRIBUTES (exp))))
 	flags |= ECF_TM_PURE;
     }
+  else
+    gcc_unreachable ();
 
   if (TREE_THIS_VOLATILE (exp))
     {
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index c9af68002ac2..ba344887d91e 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -677,7 +677,8 @@ diagnose_tm_1 (gimple_stmt_iterator *gsi, bool *handled_ops_p,
 	      }
 	    else if (direct_call_p)
 	      {
-		if (flags_from_decl_or_type (fn) & ECF_TM_BUILTIN)
+		if (IS_TYPE_OR_DECL_P (fn)
+		    && flags_from_decl_or_type (fn) & ECF_TM_BUILTIN)
 		  is_safe = true;
 		else if (replacement)
 		  {