[llvm-commits] [llvm-gcc-4.2] r117257 - in /llvm-gcc-4.2/trunk/gcc: llvm-abi.h llvm-convert.cpp

[Duncan Sands]

Author: baldrick
Date: Mon Oct 25 06:24:02 2010
New Revision: 117257

URL: http://llvm.org/viewvc/llvm-project?rev=117257&view=rev
Log:
Use the cast-to-void idiom rather than ATTRIBUTE_UNUSED to avoid
warnings about deliberately unused variables.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-abi.h
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-abi.h?rev=117257&r1=117256&r2=117257&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-abi.h (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-abi.h Mon Oct 25 06:24:02 2010
@@ -37,7 +37,6 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/LLVMContext.h"
 #include "llvm/Target/TargetData.h"
-#include "llvm/Support/Compiler.h"
 
 namespace llvm {
   class BasicBlock;
@@ -103,8 +102,9 @@
 
   /// HandleFCAArgument - This callback is invoked if the aggregate function
   /// argument is passed by value as a first class aggregate.
-  virtual void HandleFCAArgument(const llvm::Type *LLVMTy,
-                         tree type ATTRIBUTE_UNUSED) {}
+  virtual void HandleFCAArgument(const llvm::Type *LLVMTy, tree type) {
+    (void)LLVMTy; (void)type; // Unused.
+  }
 
   /// EnterField - Called when we're about the enter the field of a struct
   /// or union.  FieldNo is the number of the element we are entering in the

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=117257&r1=117256&r2=117257&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Mon Oct 25 06:24:02 2010
@@ -402,8 +402,8 @@
       ++AI;
     }
 
-    void HandleFCAArgument(const llvm::Type *LLVMTy,
-                           tree type ATTRIBUTE_UNUSED) {
+    void HandleFCAArgument(const llvm::Type *LLVMTy, tree type) {
+      (void)type; // Unused.
       // Store the FCA argument into alloca.
       assert(!LocStack.empty());
       Value *Loc = LocStack.back();
@@ -2940,8 +2940,8 @@
 
     /// HandleFCAArgument - This callback is invoked if the aggregate function
     /// argument is passed as a first class aggregate.
-    void HandleFCAArgument(const llvm::Type *LLVMTy,
-                           tree type ATTRIBUTE_UNUSED) {
+    void HandleFCAArgument(const llvm::Type *LLVMTy, tree type) {
+      (void)type; // Unused.
       Value *Loc = getAddress();
       assert(LLVMTy->getPointerTo() == Loc->getType());
       CallOperands.push_back(Builder.CreateLoad(Loc));
@@ -6413,8 +6413,8 @@
   return true;
 }
 
-bool TreeToLLVM::EmitBuiltinBZero(tree exp,
-                                  Value *&Result ATTRIBUTE_UNUSED) {
+bool TreeToLLVM::EmitBuiltinBZero(tree exp, Value *&Result) {
+  (void)Result; // Unused.
   tree arglist = TREE_OPERAND(exp, 1);
   if (!validate_arglist(arglist, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE))
     return false;
@@ -6656,8 +6656,8 @@
   return true;
 }
 
-bool TreeToLLVM::EmitBuiltinInitDwarfRegSizes(tree exp,
-                                              Value *&Result ATTRIBUTE_UNUSED) {
+bool TreeToLLVM::EmitBuiltinInitDwarfRegSizes(tree exp, Value *&Result) {
+  (void)Result; // Unused.
 #ifdef DWARF2_UNWIND_INFO
   unsigned int i;
   bool wrote_return_column = false;