[llvm-commits] [llvm] r49743 - in /llvm/trunk: lib/Transforms/Utils/LowerInvoke.cpp utils/TableGen/RegisterInfoEmitter.cpp win32/Transforms/Transforms.vcproj

[Chuck Rose III]

Author: cfr
Date: Tue Apr 15 16:27:11 2008
New Revision: 49743

URL: http://llvm.org/viewvc/llvm-project?rev=49743&view=rev
Log:
VisualStudio project files updated.  #include <algorithm> added to make VisualStudio happy.  Also had to undefine setjmp because of #include <csetjmp> turning setjmp into _setjmp in VisualStudio.

Modified:
    llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp
    llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp
    llvm/trunk/win32/Transforms/Transforms.vcproj

Modified: llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp?rev=49743&r1=49742&r2=49743&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/LowerInvoke.cpp Tue Apr 15 16:27:11 2008
@@ -143,7 +143,22 @@
                                       Constant::getNullValue(PtrJBList),
                                       "llvm.sjljeh.jblist", &M);
     }
+
+// VisualStudio defines setjmp as _setjmp via #include <csetjmp> / <setjmp.h>, 
+// so it looks like Intrinsic::_setjmp
+#if defined(_MSC_VER) && defined(setjmp)
+#define setjmp_undefined_for_visual_studio
+#undef setjmp
+#endif
+
     SetJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::setjmp);
+
+#if defined(_MSC_VER) && defined(setjmp_undefined_for_visual_studio)
+// let's return it to _setjmp state in case anyone ever needs it after this 
+// point under VisualStudio
+#define setjmp _setjmp 
+#endif
+
     LongJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::longjmp);
   }
 

Modified: llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp?rev=49743&r1=49742&r2=49743&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/RegisterInfoEmitter.cpp Tue Apr 15 16:27:11 2008
@@ -21,6 +21,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Streams.h"
 #include <set>
+#include <algorithm>
 using namespace llvm;
 
 // runEnums - Print out enum values for all of the registers.

Modified: llvm/trunk/win32/Transforms/Transforms.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/Transforms/Transforms.vcproj?rev=49743&r1=49742&r2=49743&view=diff

==============================================================================
--- llvm/trunk/win32/Transforms/Transforms.vcproj (original)
+++ llvm/trunk/win32/Transforms/Transforms.vcproj Tue Apr 15 16:27:11 2008
@@ -488,6 +488,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\lib\Transforms\Scalar\MemCpyOptimizer.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\lib\Transforms\Scalar\PredicateSimplifier.cpp"
 					>
 				</File>