From e025c70166d96d7a75a5039415321745f51f1f58 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 14 Feb 2019 23:17:11 -0500
Subject: [PATCH] stage2: fix llvm.zig with opaque types back to single-item
 pointer

---
 src-self-hosted/llvm.zig  | 20 ++++++++++----------
 src-self-hosted/value.zig |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src-self-hosted/llvm.zig b/src-self-hosted/llvm.zig
index 704e83c3c6..5cb95682ab 100644
--- a/src-self-hosted/llvm.zig
+++ b/src-self-hosted/llvm.zig
@@ -11,16 +11,16 @@ const assert = @import("std").debug.assert;
 pub const AttributeIndex = c_uint;
 pub const Bool = c_int;
 
-pub const Builder = c.LLVMBuilderRef.Child;
-pub const Context = c.LLVMContextRef.Child;
-pub const Module = c.LLVMModuleRef.Child;
-pub const Value = c.LLVMValueRef.Child;
-pub const Type = c.LLVMTypeRef.Child;
-pub const BasicBlock = c.LLVMBasicBlockRef.Child;
-pub const Attribute = c.LLVMAttributeRef.Child;
-pub const Target = c.LLVMTargetRef.Child;
-pub const TargetMachine = c.LLVMTargetMachineRef.Child;
-pub const TargetData = c.LLVMTargetDataRef.Child;
+pub const Builder = c.LLVMBuilderRef.Child.Child;
+pub const Context = c.LLVMContextRef.Child.Child;
+pub const Module = c.LLVMModuleRef.Child.Child;
+pub const Value = c.LLVMValueRef.Child.Child;
+pub const Type = c.LLVMTypeRef.Child.Child;
+pub const BasicBlock = c.LLVMBasicBlockRef.Child.Child;
+pub const Attribute = c.LLVMAttributeRef.Child.Child;
+pub const Target = c.LLVMTargetRef.Child.Child;
+pub const TargetMachine = c.LLVMTargetMachineRef.Child.Child;
+pub const TargetData = c.LLVMTargetDataRef.Child.Child;
 pub const DIBuilder = c.ZigLLVMDIBuilder;
 pub const DIFile = c.ZigLLVMDIFile;
 pub const DICompileUnit = c.ZigLLVMDICompileUnit;
diff --git a/src-self-hosted/value.zig b/src-self-hosted/value.zig
index d9d4c3d1d9..d8c0f7b5c8 100644
--- a/src-self-hosted/value.zig
+++ b/src-self-hosted/value.zig
@@ -283,8 +283,8 @@ pub const Value = struct {
             comp.gpa().destroy(self);
         }
 
-        pub fn getLlvmConst(self: *Bool, ofile: *ObjectFile) ?*llvm.Value {
-            const llvm_type = llvm.Int1TypeInContext(ofile.context);
+        pub fn getLlvmConst(self: *Bool, ofile: *ObjectFile) !?*llvm.Value {
+            const llvm_type = llvm.Int1TypeInContext(ofile.context) orelse return error.OutOfMemory;
             if (self.x) {
                 return llvm.ConstAllOnes(llvm_type);
             } else {