cherry-pick some changes from #605

src/analyzers/jetanalyzer.jl

@@ -1297,13 +1297,11 @@ function report_fieldaccess!(analyzer::JETAnalyzer, sv::InferenceState, @nospeci
  end
  end
  fidx = _getfield_fieldindex(s, name)
- fidx === nothing && @goto report_nofield_error
- ftypes = Base.datatype_fieldtypes(s)
- nf = length(ftypes)
- (fidx < 1 || fidx > nf) && @goto report_nofield_error
- return false
+ if fidx !== nothing
+ nf = length(Base.datatype_fieldtypes(s))
+ 1 ≤ fidx ≤ nf && return false
+ end
 
- @label report_nofield_error
  namev = (name::Const).val
  objtyp = s00
  if namev isa Symbol

test/analyzers/test_jetanalyzer.jl

@@ -701,15 +701,16 @@ access_field(x::InvalidBuiltinStruct, sym) = getfield(x, sym)
  end
 
  @testset "constant propagation" begin
- result = report_call(x::InvalidBuiltinStruct->access_field(x,:v))
- @test isempty(get_reports_with_test(result))
-
- result = report_call(x::InvalidBuiltinStruct->access_field(x,:w))
- report = only(get_reports_with_test(result))
- @test report isa BuiltinErrorReport && report.f === getfield
-
- result = report_call(x::InvalidBuiltinStruct->access_field(x,:v))
- @test isempty(get_reports_with_test(result))
+ let result = report_call(x::InvalidBuiltinStruct->access_field(x,:v))
+ @test isempty(get_reports_with_test(result))
+ end
+ let result = report_call(x::InvalidBuiltinStruct->access_field(x,:w))
+ report = only(get_reports_with_test(result))
+ @test report isa BuiltinErrorReport && report.f === getfield
+ end
+ let result = report_call(x::InvalidBuiltinStruct->access_field(x,:v))
+ @test isempty(get_reports_with_test(result))
+ end
  end
 end