[llvm-commits] [dragonegg] r149507 - in /dragonegg/trunk/src: Convert.cpp DefaultABI.cpp Types.cpp

[Duncan Sands]

Author: baldrick
Date: Wed Feb  1 08:49:44 2012
New Revision: 149507

URL: http://llvm.org/viewvc/llvm-project?rev=149507&view=rev
Log:
Avoid compiler warnings about unused parameters when compiling for ARM.

Modified:
    dragonegg/trunk/src/Convert.cpp
    dragonegg/trunk/src/DefaultABI.cpp
    dragonegg/trunk/src/Types.cpp

Modified: dragonegg/trunk/src/Convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Convert.cpp?rev=149507&r1=149506&r2=149507&view=diff
==============================================================================
--- dragonegg/trunk/src/Convert.cpp (original)
+++ dragonegg/trunk/src/Convert.cpp Wed Feb  1 08:49:44 2012
@@ -468,7 +468,9 @@
 // passed in memory byval.
 static bool isPassedByVal(tree type, Type *Ty,
                           std::vector<Type*> &ScalarArgs,
-                          bool isShadowRet, CallingConv::ID &/*CC*/) {
+                          bool isShadowRet, CallingConv::ID CC) {
+  (void)type; (void)Ty; (void)ScalarArgs; (void)isShadowRet;
+  (void)CC; // Not used by all ABI macros.
   if (LLVM_SHOULD_PASS_AGGREGATE_USING_BYVAL_ATTR(type, Ty))
     return true;
 
@@ -3572,6 +3574,9 @@
 
   return LLVM_TARGET_INTRINSIC_LOWER(stmt, fndecl, DestLoc, Result, ResultType,
                                      Operands);
+#else
+  // Avoid compiler warnings about unused parameters.
+  (void)stmt; (void)fndecl; (void)DestLoc; (void)Result;
 #endif
   return false;
 }

Modified: dragonegg/trunk/src/DefaultABI.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/DefaultABI.cpp?rev=149507&r1=149506&r2=149507&view=diff
==============================================================================
--- dragonegg/trunk/src/DefaultABI.cpp (original)
+++ dragonegg/trunk/src/DefaultABI.cpp Wed Feb  1 08:49:44 2012
@@ -39,7 +39,8 @@
 
 // doNotUseShadowReturn - Return true if the specified GCC type
 // should not be returned using a pointer to struct parameter.
-bool doNotUseShadowReturn(tree type, tree fndecl, CallingConv::ID /*CC*/) {
+bool doNotUseShadowReturn(tree type, tree fndecl, CallingConv::ID CC) {
+  (void)CC; // Not used by all ABI macros.
   if (!TYPE_SIZE(type))
     return false;
   if (TREE_CODE(TYPE_SIZE(type)) != INTEGER_CST)
@@ -128,6 +129,7 @@
 /// on the client that indicate how its pieces should be handled.  This
 /// handles things like returning structures via hidden parameters.
 void DefaultABI::HandleReturnType(tree type, tree fn, bool isBuiltin) {
+  (void)isBuiltin; // Not used by all ABI macros.
   unsigned Offset = 0;
   Type *Ty = ConvertType(type);
   if (Ty->isVectorTy()) {
@@ -252,7 +254,6 @@
     for (tree Field = TYPE_FIELDS(type); Field; Field = TREE_CHAIN(Field))
       if (TREE_CODE(Field) == FIELD_DECL) {
         const tree Ftype = TREE_TYPE(Field);
-        Type *FTy = ConvertType(Ftype);
         unsigned FNo = GetFieldIndex(Field, Ty);
         assert(FNo < INT_MAX && "Case not handled yet!");
 
@@ -262,6 +263,8 @@
         // (We know there currently are no other such cases active because
         // they would hit the assert in FunctionPrologArgumentConversion::
         // HandleByValArgument.)
+        Type *FTy = ConvertType(Ftype);
+        (void)FTy; // Not used by all ABI macros.
         if (!LLVM_SHOULD_PASS_AGGREGATE_USING_BYVAL_ATTR(Ftype, FTy)) {
           C.EnterField(FNo, Ty);
           HandleArgument(TREE_TYPE(Field), ScalarElts);

Modified: dragonegg/trunk/src/Types.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Types.cpp?rev=149507&r1=149506&r2=149507&view=diff
==============================================================================
--- dragonegg/trunk/src/Types.cpp (original)
+++ dragonegg/trunk/src/Types.cpp Wed Feb  1 08:49:44 2012
@@ -799,11 +799,11 @@
                                              Attribute::Nest));
   }
 
+#ifdef LLVM_TARGET_ENABLE_REGPARM
   // If the target has regparam parameters, allow it to inspect the function
   // type.
   int local_regparam = 0;
   int local_fp_regparam = 0;
-#ifdef LLVM_TARGET_ENABLE_REGPARM
   LLVM_TARGET_INIT_REGPARM(local_regparam, local_fp_regparam, type);
 #endif // LLVM_TARGET_ENABLE_REGPARM