From 80d2e8ffc1b2a47956fde628bcf6cc8073fb731a Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <j.ketema@imperial.ac.uk>
Date: Sun, 12 Feb 2017 21:33:49 +0000
Subject: [PATCH] Move BufferPtr into the block where it it being used

The previous location outside the block would crash prepare-builtins
when no the builtins file accidentially not passed on the command line.

llvm-svn: 294916
---
 libclc/utils/prepare-builtins.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libclc/utils/prepare-builtins.cpp b/libclc/utils/prepare-builtins.cpp
index c8b1f446e359..882dadd261fd 100644
--- a/libclc/utils/prepare-builtins.cpp
+++ b/libclc/utils/prepare-builtins.cpp
@@ -36,10 +36,10 @@ int main(int argc, char **argv) {
   {
     ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr =
       MemoryBuffer::getFile(InputFilename);
-    std::unique_ptr<MemoryBuffer> &BufferPtr = BufferOrErr.get();
-    if (std::error_code  ec = BufferOrErr.getError())
+    if (std::error_code  ec = BufferOrErr.getError()) {
       ErrorMessage = ec.message();
-    else {
+    } else {
+      std::unique_ptr<MemoryBuffer> &BufferPtr = BufferOrErr.get();
       ErrorOr<std::unique_ptr<Module>> ModuleOrErr =
           expectedToErrorOrAndEmitErrors(Context,
           parseBitcodeFile(BufferPtr.get()->getMemBufferRef(), Context));