Subzero: Move to C++11 static_assert().

src/IceIntrinsics.cpp

 //===- subzero/src/IceIntrinsics.cpp - Functions related to intrinsics ----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the Intrinsics utilities for matching and
 // then dispatching by name.
 //
 //===----------------------------------------------------------------------===//
 
 #include "IceCfg.h"
 #include "IceCfgNode.h"
 #include "IceInst.h"
 #include "IceIntrinsics.h"
 #include "IceLiveness.h"
 #include "IceOperand.h"
 
 #include <utility>
 
 namespace Ice {
 
 namespace {
 
 void __attribute__((unused)) xIntrinsicInfoSizeCheck() {
-  STATIC_ASSERT(sizeof(Intrinsics::IntrinsicInfo) == 4);
+  static_assert(sizeof(Intrinsics::IntrinsicInfo) == 4,

[jvoung (off chromium), 2014/10/01 17:32:53]

Does static_assert() need to be wrapped in a unused function, or can it now be
just in the namespace { } (or the IceIntrinsics class)?

[Jim Stichnoth, 2014/10/01 20:02:41]

Good point.  I removed the dummy function wrappers in all 3 files.

Unfortunately, "make format-diff" was a bit shy about fixing the indentation
inside the various namespaces, so I ran clang-format-3.4 on the entirety of two
of the files, so there are now a bunch of whitespace diffs.

+                "Unexpected sizeof(IntrinsicInfo)");
 }
 
 #define INTRIN(ID, SE, RT) { Intrinsics::ID, Intrinsics::SE, Intrinsics::RT }
 
 // Build list of intrinsics with their attributes and expected prototypes.
 // List is sorted alphabetically.
 const struct IceIntrinsicsEntry_ {
   Intrinsics::FullIntrinsicInfo Info;
   const char *IntrinsicName;
 } IceIntrinsicsTable[] = {
@@ skipping 210 matching lines @@
   return Intrinsics::IsValidCall;
 }
 
 Type Intrinsics::FullIntrinsicInfo::getArgType(SizeT Index) const {
   assert(NumTypes > 1);
   assert(Index + 1 < NumTypes);
   return Signature[Index + 1];
 }
 
 } // end of namespace Ice