l2s: couple fixes

shady-gang · Jul 17, 2024 · 9fc1e75 · 9fc1e75
1 parent 02d042e
commit 9fc1e75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/frontend/llvm/l2s.c b/src/frontend/llvm/l2s.c
@@ -276,7 +276,7 @@ bool parse_llvm_into_shady(const CompilerConfig* config, size_t len, const char*
     if (global_annotations)
         process_llvm_annotations(&p, global_annotations);
 
-    for (LLVMValueRef fn = LLVMGetFirstFunction(src); fn && fn <= LLVMGetNextFunction(fn); fn = LLVMGetLastFunction(src)) {
+    for (LLVMValueRef fn = LLVMGetFirstFunction(src); fn; fn = LLVMGetNextFunction(fn)) {
         convert_function(&p, fn);
     }
 

diff --git a/src/frontend/llvm/l2s_instr.c b/src/frontend/llvm/l2s_instr.c
@@ -516,6 +516,10 @@ EmittedInstr convert_instruction(Parser* p, FnParseCtx* fn_ctx, Node* fn_or_bb,
                     // don't care
                     return (EmittedInstr) { 0 };
                 }
+                if (string_starts_with(intrinsic, "llvm.experimental.noalias.scope.decl")) {
+                    // don't care
+                    return (EmittedInstr) { 0 };
+                }
                 if (string_starts_with(intrinsic, "llvm.memcpy")) {
                     Nodes ops = convert_operands(p, num_ops, instr);
                     num_results = 0;

diff --git a/src/frontend/llvm/l2s_type.c b/src/frontend/llvm/l2s_type.c
@@ -66,7 +66,7 @@ const Type* convert_type(Parser* p, LLVMTypeRef t) {
             }
 
             const Node* product = record_type(a, (RecordType) {
-                    .members = nodes(a, size, celements)
+                .members = nodes(a, size, celements)
             });
             if (decl)
                 decl->payload.nom_type.body = product;