diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-09-21 13:10:21 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-09-21 13:10:21 -0400 |
| commit | 5a21d3dce0c020833bfe426049e2391ae3977846 (patch) | |
| tree | d1f5c329609672edbc26cb892649cc1f3d36fc51 /src/codegen.cpp | |
| parent | 44f2ee101f244342ec7e4cd81bb21d9a0c23267b (diff) | |
| parent | f2186e5fa753ef84003fcc21cd60692e009a8941 (diff) | |
| download | zig-5a21d3dce0c020833bfe426049e2391ae3977846.tar.gz zig-5a21d3dce0c020833bfe426049e2391ae3977846.zip | |
Merge branch 'BitByteOffsetOfs' of https://github.com/raulgrell/zig into raulgrell-BitByteOffsetOfs
Diffstat (limited to 'src/codegen.cpp')
| -rw-r--r-- | src/codegen.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp index 6c4b54261c..d4d57d541c 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -5098,7 +5098,8 @@ static LLVMValueRef ir_render_instruction(CodeGen *g, IrExecutable *executable, case IrInstructionIdTypeName: case IrInstructionIdDeclRef: case IrInstructionIdSwitchVar: - case IrInstructionIdOffsetOf: + case IrInstructionIdByteOffsetOf: + case IrInstructionIdBitOffsetOf: case IrInstructionIdTypeInfo: case IrInstructionIdTypeId: case IrInstructionIdSetEvalBranchQuota: @@ -6671,7 +6672,8 @@ static void define_builtin_fns(CodeGen *g) { create_builtin_fn(g, BuiltinFnIdTagName, "tagName", 1); create_builtin_fn(g, BuiltinFnIdTagType, "TagType", 1); create_builtin_fn(g, BuiltinFnIdFieldParentPtr, "fieldParentPtr", 3); - create_builtin_fn(g, BuiltinFnIdOffsetOf, "offsetOf", 2); + create_builtin_fn(g, BuiltinFnIdByteOffsetOf, "byteOffsetOf", 2); + create_builtin_fn(g, BuiltinFnIdBitOffsetOf, "bitOffsetOf", 2); create_builtin_fn(g, BuiltinFnIdDivExact, "divExact", 2); create_builtin_fn(g, BuiltinFnIdDivTrunc, "divTrunc", 2); create_builtin_fn(g, BuiltinFnIdDivFloor, "divFloor", 2); |