diff options
author | Yaron Keren <yaron.keren@gmail.com> | 2014-03-25 08:42:49 +0000 |
---|---|---|
committer | Yaron Keren <yaron.keren@gmail.com> | 2014-03-25 08:42:49 +0000 |
commit | d8ceb275c2d3c0f09cb3bf814ad32c23deb93e10 (patch) | |
tree | eafac143ef74ca537b137dbbab8ee589560a4226 /lib | |
parent | 4fd5cd06c815724fa410c0bea276d919dea868c3 (diff) | |
download | llvm-d8ceb275c2d3c0f09cb3bf814ad32c23deb93e10.tar.gz llvm-d8ceb275c2d3c0f09cb3bf814ad32c23deb93e10.tar.bz2 llvm-d8ceb275c2d3c0f09cb3bf814ad32c23deb93e10.tar.xz |
Disable Visual C++ warning 4722 about aborting a destructor,
it has no value for us.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204704 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/IR/User.cpp | 20 | ||||
-rw-r--r-- | lib/Support/Process.cpp | 13 |
2 files changed, 0 insertions, 33 deletions
diff --git a/lib/IR/User.cpp b/lib/IR/User.cpp index cd124df1e9..940682826a 100644 --- a/lib/IR/User.cpp +++ b/lib/IR/User.cpp @@ -83,28 +83,8 @@ void User::operator delete(void *Usr) { // Operator Class //===----------------------------------------------------------------------===// -#if defined(_MSC_VER)
-// In Release modes, Visual Studio complains that the Operator destructor
-// never returns, which is true by design.
-// This does *not* depend on llvm_unreachable being dependent on NDEBUG:
-// even if llvm_unreachable is replaced by __assume(false), VC still warns in
-// Release modes but not in Debug modes. The real reason is optimization flags.
-// With /Od in Debug modes the warning is not issued whereas with /O1 it is.
-// I could not find any documentation to this effect, it is reproducable:
-// Try compiling http://msdn.microsoft.com/en-us/library/khwfyc5d(v=vs.90).aspx
-// with /O1 and then with /Od.
-// Anyhow, solution is same as lib/Support/Process.cpp:~self_process().
-
-#pragma warning(push)
-#pragma warning(disable:4722)
-#endif
-
Operator::~Operator() { llvm_unreachable("should never destroy an Operator"); } -#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
- } // End llvm namespace diff --git a/lib/Support/Process.cpp b/lib/Support/Process.cpp index d5168f03a6..0380ed955d 100644 --- a/lib/Support/Process.cpp +++ b/lib/Support/Process.cpp @@ -34,14 +34,6 @@ self_process *process::get_self() { return SP; } -#if defined(_MSC_VER) -// Visual Studio complains that the self_process destructor never exits. This -// doesn't make much sense, as that's the whole point of calling abort... Just -// silence this warning. -#pragma warning(push) -#pragma warning(disable:4722) -#endif - // The destructor for the self_process subclass must never actually be // executed. There should be at most one instance of this class, and that // instance should live until the process terminates to avoid the potential for @@ -75,11 +67,6 @@ TimeValue self_process::get_wall_time() const { } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif - - #define COLOR(FGBG, CODE, BOLD) "\033[0;" BOLD FGBG CODE "m" #define ALLCOLORS(FGBG,BOLD) {\ |