Skip to content

Commit b9da01a

Browse files
criemencriemen
committed
Merge remote-tracking branch 'origin/main' into criemen/new-pkg
2 parents 60cb8e7 + 5875ec2 commit b9da01a

File tree

261 files changed

+5639
-7053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+5639
-7053
lines changed

‎.bazelrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
1010

1111
build --repo_env=CC=clang --repo_env=CXX=clang++
1212

13-
build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
14-
# we currently cannot built the swift extractor for ARM
15-
build:macos --cxxopt=-std=c++20 --host_cxxopt=-std=c++20 --copt=-arch --copt=x86_64 --linkopt=-arch --linkopt=x86_64
16-
build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor --host_cxxopt=/std:c++20 --host_cxxopt=/Zc:preprocessor
13+
# we use transitions that break builds of `...`, so for `test` to work with that we need the following
14+
test --build_tests_only
1715

1816
# this requires developer mode, but is required to have pack installer functioning
1917
startup --windows_enable_symlinks

‎.github/workflows/go-tests-other-os.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
- .github/workflows/go-tests-other-os.yml
88
- .github/actions/**
99
- codeql-workspace.yml
10+
- MODULE.bazel
11+
- .bazelrc
12+
- misc/bazel/**
1013

1114
permissions:
1215
contents: read

‎.github/workflows/go-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
- .github/workflows/go-tests.yml
1616
- .github/actions/**
1717
- codeql-workspace.yml
18+
- MODULE.bazel
19+
- .bazelrc
20+
- misc/bazel/**
1821

1922
permissions:
2023
contents: read

‎.github/workflows/swift.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,6 @@ jobs:
6868
steps:
6969
- uses: actions/checkout@v4
7070
- uses: ./swift/actions/run-ql-tests
71-
integration-tests-linux:
72-
if: github.repository_owner == 'github'
73-
needs: build-and-test-linux
74-
runs-on: ubuntu-latest-xl
75-
steps:
76-
- uses: actions/checkout@v4
77-
- uses: ./swift/actions/run-integration-tests
78-
integration-tests-macos:
79-
if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
80-
needs: build-and-test-macos
81-
runs-on: macos-12-xl
82-
timeout-minutes: 60
83-
steps:
84-
- uses: actions/checkout@v4
85-
- uses: ./swift/actions/run-integration-tests
8671
clang-format:
8772
if : ${{ github.event_name == 'pull_request' }}
8873
runs-on: ubuntu-latest

‎csharp/ql/integration-tests/legacy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
These tests are still run with the legacy test runner

‎csharp/ql/lib/ext/System.Data.model.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ extensions:
5454
- ["System.Data", "EnumerableRowCollectionExtensions", False, "Where<TRow>", "(System.Data.EnumerableRowCollection<TRow>,System.Func<TRow,System.Boolean>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
5555
- ["System.Data", "IColumnMappingCollection", True, "get_Item", "(System.String)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
5656
- ["System.Data", "IColumnMappingCollection", True, "set_Item", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].Element", "value", "manual"]
57+
- ["System.Data", "IDataRecord", True, "GetString", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
58+
- ["System.Data", "IDataRecord", True, "GetValue", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
59+
- ["System.Data", "IDataRecord", True, "GetValues", "(System.Object[])", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
60+
- ["System.Data", "IDataRecord", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
61+
- ["System.Data", "IDataRecord", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
62+
- ["System.Data", "IDbCommand", True, "ExecuteReader", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
5763
- ["System.Data", "IDataParameterCollection", True, "get_Item", "(System.String)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
5864
- ["System.Data", "IDataParameterCollection", True, "set_Item", "(System.String,System.Object)", "", "Argument[1]", "Argument[this].Element", "value", "manual"]
5965
- ["System.Data", "ITableMappingCollection", True, "get_Item", "(System.String)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
@@ -73,3 +79,11 @@ extensions:
7379
- ["System.Data", "TypedTableBaseExtensions", False, "Select<TRow,S>", "(System.Data.TypedTableBase<TRow>,System.Func<TRow,S>)", "", "Argument[1].ReturnValue", "ReturnValue.Element", "value", "manual"]
7480
- ["System.Data", "TypedTableBaseExtensions", False, "Where<TRow>", "(System.Data.TypedTableBase<TRow>,System.Func<TRow,System.Boolean>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "manual"]
7581
- ["System.Data", "TypedTableBaseExtensions", False, "Where<TRow>", "(System.Data.TypedTableBase<TRow>,System.Func<TRow,System.Boolean>)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
82+
83+
- addsTo:
84+
pack: codeql/csharp-all
85+
extensible: neutralModel
86+
data:
87+
- ["System.Data", "IDataRecord", "GetDataTypeName", "(System.Int32)", "summary", "manual"]
88+
- ["System.Data", "IDataRecord", "GetGuid", "(System.Int32)", "summary", "manual"]
89+
- ["System.Data", "IDataRecord", "GetName", "(System.Int32)", "summary", "manual"]

‎csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ extensions:
55
extensible: summaryModel
66
data:
77
- ["ILCompiler.IBC", "IBCProfileData", False, "IBCProfileData", "(ILCompiler.IBC.MibcConfig,System.Boolean,System.Collections.Generic.IEnumerable<ILCompiler.MethodProfileData>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
8-
- ["ILCompiler.IBC", "IBCProfileData", False, "get_Config", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
98
- ["ILCompiler.IBC", "MibcConfig", False, "FromKeyValueMap", "(System.Collections.Generic.Dictionary<System.String,System.String>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
109
- ["ILCompiler.IBC", "MibcConfig", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
1110
- addsTo:

‎csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.model.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ extensions:
1313
- ["ILCompiler.Reflection.ReadyToRun", "EHInfo", False, "get_EHClauses", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
1414
- ["ILCompiler.Reflection.ReadyToRun", "GCRefMap", False, "GCRefMap", "(System.UInt32,ILCompiler.Reflection.ReadyToRun.GCRefMapEntry[])", "", "Argument[1].Element", "Argument[this]", "taint", "df-generated"]
1515
- ["ILCompiler.Reflection.ReadyToRun", "GCRefMapDecoder", False, "GCRefMapDecoder", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
16+
- ["ILCompiler.Reflection.ReadyToRun", "IAssemblyMetadata", True, "get_ImageReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
17+
- ["ILCompiler.Reflection.ReadyToRun", "IAssemblyMetadata", True, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
1618
- ["ILCompiler.Reflection.ReadyToRun", "InliningInfoSection2", False, "InliningInfoSection2", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
1719
- ["ILCompiler.Reflection.ReadyToRun", "InliningInfoSection", False, "InliningInfoSection", "(ILCompiler.Reflection.ReadyToRun.ReadyToRunReader,System.Int32,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
1820
- ["ILCompiler.Reflection.ReadyToRun", "InstanceMethod", False, "InstanceMethod", "(System.Byte,ILCompiler.Reflection.ReadyToRun.ReadyToRunMethod)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -66,8 +68,6 @@ extensions:
6668
- ["ILCompiler.Reflection.ReadyToRun", "RuntimeFunction", False, "get_EHInfo", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
6769
- ["ILCompiler.Reflection.ReadyToRun", "SignatureDecoder", False, "GetMetadataReaderFromModuleOverride", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
6870
- ["ILCompiler.Reflection.ReadyToRun", "StandaloneAssemblyMetadata", False, "StandaloneAssemblyMetadata", "(System.Reflection.PortableExecutable.PEReader)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
69-
- ["ILCompiler.Reflection.ReadyToRun", "StandaloneAssemblyMetadata", False, "get_ImageReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
70-
- ["ILCompiler.Reflection.ReadyToRun", "StandaloneAssemblyMetadata", False, "get_MetadataReader", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
7171
- ["ILCompiler.Reflection.ReadyToRun", "StringBuilderExtensions", False, "AppendEscapedString", "(System.Text.StringBuilder,System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
7272
- ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetArrayType", "(System.String,System.Reflection.Metadata.ArrayShape)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
7373
- ["ILCompiler.Reflection.ReadyToRun", "StringTypeProviderBase<TGenericContext>", True, "GetByReferenceType", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -113,8 +113,6 @@ extensions:
113113
- ["ILCompiler.Reflection.ReadyToRun", "GCRefMapEntry", "GCRefMapEntry", "(System.Int32,ILCompiler.Reflection.ReadyToRun.CORCOMPILE_GCREFMAP_TOKENS)", "summary", "df-generated"]
114114
- ["ILCompiler.Reflection.ReadyToRun", "GcStackSlot", "GcStackSlot", "(System.Int32,ILCompiler.Reflection.ReadyToRun.GcStackSlotBase)", "summary", "df-generated"]
115115
- ["ILCompiler.Reflection.ReadyToRun", "GcStackSlot", "ToString", "()", "summary", "df-generated"]
116-
- ["ILCompiler.Reflection.ReadyToRun", "IAssemblyMetadata", "get_ImageReader", "()", "summary", "df-generated"]
117-
- ["ILCompiler.Reflection.ReadyToRun", "IAssemblyMetadata", "get_MetadataReader", "()", "summary", "df-generated"]
118116
- ["ILCompiler.Reflection.ReadyToRun", "IAssemblyResolver", "FindAssembly", "(System.Reflection.Metadata.MetadataReader,System.Reflection.Metadata.AssemblyReferenceHandle,System.String)", "summary", "df-generated"]
119117
- ["ILCompiler.Reflection.ReadyToRun", "IAssemblyResolver", "FindAssembly", "(System.String,System.String)", "summary", "df-generated"]
120118
- ["ILCompiler.Reflection.ReadyToRun", "IR2RSignatureTypeProvider<TType,TMethod,TGenericContext>", "GetCanonType", "()", "summary", "df-generated"]

‎csharp/ql/lib/ext/generated/ILCompiler.model.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@ extensions:
77
- ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
88
- ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[3].Element", "Argument[this]", "taint", "df-generated"]
99
- ["ILCompiler", "MethodProfileData", False, "MethodProfileData", "(Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfilingDataFlags,System.Double,System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,System.Int32>,System.UInt32,Internal.Pgo.PgoSchemaElem[])", "", "Argument[5].Element", "Argument[this]", "taint", "df-generated"]
10+
- ["ILCompiler", "ProfileData", True, "get_Config", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
1011
- addsTo:
1112
pack: codeql/csharp-all
1213
extensible: neutralModel
1314
data:
1415
- ["ILCompiler", "EmptyProfileData", "GetAllMethodProfileData", "()", "summary", "df-generated"]
1516
- ["ILCompiler", "EmptyProfileData", "GetMethodBlockCount", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
1617
- ["ILCompiler", "EmptyProfileData", "GetMethodProfileData", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
17-
- ["ILCompiler", "EmptyProfileData", "get_Config", "()", "summary", "df-generated"]
1818
- ["ILCompiler", "EmptyProfileData", "get_PartialNGen", "()", "summary", "df-generated"]
1919
- ["ILCompiler", "EmptyProfileData", "get_Singleton", "()", "summary", "df-generated"]
2020
- ["ILCompiler", "ProfileData", "GetAllMethodProfileData", "()", "summary", "df-generated"]
2121
- ["ILCompiler", "ProfileData", "GetMethodBlockCount", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
2222
- ["ILCompiler", "ProfileData", "GetMethodProfileData", "(Internal.TypeSystem.MethodDesc)", "summary", "df-generated"]
2323
- ["ILCompiler", "ProfileData", "MergeProfileData", "(System.Collections.Generic.Dictionary<Internal.TypeSystem.MethodDesc,ILCompiler.MethodProfileData>,ILCompiler.ProfileData)", "summary", "df-generated"]
24-
- ["ILCompiler", "ProfileData", "get_Config", "()", "summary", "df-generated"]
2524
- ["ILCompiler", "ProfileData", "get_PartialNGen", "()", "summary", "df-generated"]

0 commit comments

Comments
 (0)