* semantics.c (finish_asm_stmt): Always permit volatile asms.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22632 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2bc04c9..c095d30 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-09-28  Anthony Green  <green@cygnus.com>
+
+       * semantics.c (finish_asm_stmt): Always permit volatile asms.
+
 1998-09-28  Mark Mitchell  <mark@markmitchell.com>
 
        * decl.c (grokdeclarator): Tighten checks for invalid

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index eee6616..6f69d64 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -730,28 +730,18 @@ finish_asm_stmt (cv_qualifier, string, output_operands,
   else
     {
       emit_line_note (input_filename, lineno);
-      if (output_operands != NULL_TREE || input_operands != NULL_TREE
-         || clobbers != NULL_TREE)
-       {
-         if (cv_qualifier != NULL_TREE
-             && cv_qualifier != ridpointers[(int) RID_VOLATILE])
-           cp_warning ("%s qualifier ignored on asm",
-                       IDENTIFIER_POINTER (cv_qualifier));
-           
-         c_expand_asm_operands (string, output_operands,
-                                input_operands, 
-                                clobbers,
-                                cv_qualifier 
-                                == ridpointers[(int) RID_VOLATILE],
-                                input_filename, lineno);
-       }
-      else
-       {
-         if (cv_qualifier != NULL_TREE)
-           cp_warning ("%s qualifier ignored on asm",
-                       IDENTIFIER_POINTER (cv_qualifier));
-         expand_asm (string);
-       }
+
+      if (cv_qualifier != NULL_TREE
+         && cv_qualifier != ridpointers[(int) RID_VOLATILE])
+       cp_warning ("%s qualifier ignored on asm",
+                   IDENTIFIER_POINTER (cv_qualifier));
+      
+      c_expand_asm_operands (string, output_operands,
+                            input_operands, 
+                            clobbers,
+                            cv_qualifier 
+                            == ridpointers[(int) RID_VOLATILE],
+                            input_filename, lineno);
 
       finish_stmt ();
     }