Fix merge issue

Author: BioTurboNick

base/compiler/ssair/inlining.jl

@@ -332,7 +332,7 @@ function ir_inline_item!(compact::IncrementalCompact, idx::Int, argexprs::Vector
     topline::Int32 = linetable_offset + Int32(1)
     coverage = coverage_enabled(def.module)
     coverage_by_path = JLOptions().code_coverage == 3
-    push!(linetable, LineInfoNode(def.module, item.mi, def.file, Int(def.line), inlined_at))
+    push!(linetable, LineInfoNode(def.module, item.mi, def.file, def.line, inlined_at))
     oldlinetable = spec.ir.linetable
     for oldline in 1:length(oldlinetable)
         entry = oldlinetable[oldline]

base/compiler/typeinfer.jl

@@ -949,7 +949,7 @@ function typeinf_ext(interp::AbstractInterpreter, mi::MethodInstance)
                 tree.slotflags = fill(IR_FLAG_NULL, nargs)
                 tree.ssavaluetypes = 1
                 tree.codelocs = Int32[1]
-                tree.linetable = [LineInfoNode(method.module, mi, method.file, Int(method.line), Int32(0))]
+                tree.linetable = [LineInfoNode(method.module, mi, method.file, method.line, Int32(0))]
                 tree.inferred = true
                 tree.ssaflags = UInt8[0]
                 tree.pure = true