diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70b69cc2fd3..75d3dec41be 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -23,6 +23,9 @@
 
 2003-04-29  Geoffrey Keating  <geoffk@apple.com>
 
+	* tree-inline.c (inlinable_function_p): Don't support inlining
+	functions using varargs.
+
 	* doc/invoke.texi (Overall Options): Mention -x objective-c-header.
 
 	* dwarf2out.c (output_call_frame_info): No need to output EH
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4a0d42cbea2..14607687a20 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-29  Geoffrey Keating  <geoffk@apple.com>
+
+	* gcc.c-torture/compile/inline-1.c: New file.
+
 2003-04-29  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/10551
diff --git a/gcc/testsuite/gcc.c-torture/compile/inline-1.c b/gcc/testsuite/gcc.c-torture/compile/inline-1.c
new file mode 100644
index 00000000000..23af7cb2bfc
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/inline-1.c
@@ -0,0 +1,21 @@
+typedef __builtin_va_list va_list;
+
+extern void foo (va_list);
+
+static void
+build_message_string (const char *msg, ...)
+{
+  va_list ap;
+
+  __builtin_va_start (ap, msg);
+  foo (ap);
+  __builtin_va_end (ap);
+}
+
+void
+file_name_as_prefix (f)
+     const char *f;
+{
+  build_message_string ("%s: ", f);
+}
+
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 3a8adc51e2e..d1acba3a5f0 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1008,6 +1008,13 @@ inlinable_function_p (fn, id, nolimit)
   else if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL
 	   && find_alloca_call (DECL_SAVED_TREE (fn)))
     ;
+  /* Can't inline functions which use varargs.  It's not theoretically
+     impossible, we just don't do it yet; at least one problem is that
+     expand_builtin_next_arg needs to handle the situation.  */
+  else if (TYPE_ARG_TYPES (TREE_TYPE (fn)) != 0
+	   && (TREE_VALUE (tree_last (TYPE_ARG_TYPES (TREE_TYPE (fn))))
+	       != void_type_node))
+    ;
   /* All is well.  We can inline this function.  Traditionally, GCC
      has refused to inline functions using alloca, or functions whose
      values are returned in a PARALLEL, and a few other such obscure