From fd3e79b7bb2c19081c8ef69ad2a6632e5b52156f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jernej=20Krempu=C5=A1?= <jkrempus@gmail.com>
Date: Wed, 3 Oct 2012 15:26:43 +0200
Subject: [PATCH] Corrections.

---
 gen/pragma.cpp | 28 +++-------------------------
 gen/toir.cpp   |  2 --
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/gen/pragma.cpp b/gen/pragma.cpp
index 588b6568..4118d4d9 100644
--- a/gen/pragma.cpp
+++ b/gen/pragma.cpp
@@ -116,26 +116,15 @@ Pragma DtoGetPragma(Scope *sc, PragmaDeclaration *decl, std::string &arg1str)
         return LLVMshufflevector;
     }
 
-    // pragma(extractelement) { funcdecl(s) }
-    else if (ident == Id::Extractelement)
+    // pragma(extractelement or insertelement) { funcdecl(s) }
+    else if (ident == Id::Extractelement || ident == Id::Insertelement)
     {
         if (args && args->dim > 0)
         {
              error("takes no parameters");
              fatal();
         }
-        return LLVMextractelement;
-    }
-
-    // pragma(insertelement) { funcdecl(s) }
-    else if (ident == Id::Insertelement)
-    {
-        if (args && args->dim > 0)
-        {
-             error("takes no parameters");
-             fatal();
-        }
-        return LLVMinsertelement;
+        return ident == Id::Extractelement ? LLVMextractelement : LLVMinsertelement;
     }
 
     // pragma(va_start) { templdecl(s) }
@@ -398,17 +387,6 @@ void DtoCheckPragma(PragmaDeclaration *decl, Dsymbol *s,
         break;
 
     case LLVMextractelement:
-        if (FuncDeclaration* fd = s->isFuncDeclaration())
-        {
-            fd->llvmInternal = llvm_internal;
-        }
-        else
-        {
-            error("the '%s' pragma must only be used on function declarations.", ident->toChars());
-            fatal();
-        }
-        break;
-
     case LLVMinsertelement:
         if (FuncDeclaration* fd = s->isFuncDeclaration())
         {
diff --git a/gen/toir.cpp b/gen/toir.cpp
index be25b755..f819e36e 100644
--- a/gen/toir.cpp
+++ b/gen/toir.cpp
@@ -45,8 +45,6 @@
 
 #include "llvm/Support/ManagedStatic.h"
 
-#include "llvm/Support/raw_ostream.h"
-
 llvm::cl::opt<bool> checkPrintf("check-printf-calls",
     llvm::cl::desc("Validate printf call format strings against arguments"),
     llvm::cl::ZeroOrMore);