diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 56ad96db752..1a03ac2dc05 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* function-abi.cc (expr_callee_abi): Assert for POINTER_TYPE_P.
+
 2019-10-16  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* genmodes.c (mode_data::order): New field.
diff --git a/gcc/function-abi.cc b/gcc/function-abi.cc
index b4a18396367..2c23b4936bf 100644
--- a/gcc/function-abi.cc
+++ b/gcc/function-abi.cc
@@ -249,12 +249,6 @@ expr_callee_abi (const_tree exp)
   if (type == error_mark_node)
     return default_function_abi;
 
-  if (POINTER_TYPE_P (type))
-    {
-      type = TREE_TYPE (type);
-      if (type == error_mark_node)
-	return default_function_abi;
-    }
-
-  return fntype_abi (type);
+  gcc_assert (POINTER_TYPE_P (type));
+  return fntype_abi (TREE_TYPE (type));
 }