Manual merge upstream #251
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Leaves ReDoS.ql unmodified since it's not a dataflow query; just moves it to its own directory.
It's a non-path query, so the InlineExpectationsTest postprocessor doesn't do anything.
This fixes the failing diff-informed consistency check.
This is because it was failing the diff-informed consistency check, and like other ReDoS queries (Python?) the query tries to be helpful by showing a substring of a regex, which has a `hasLocation(...)` (intensional) but no corresponding `getLocation()` (extensional). Until the location overrides get updated to support `hasLocation`-based locations, it's probably best to turn off diff-informed support.
This commit changes pick-kotlin-version.py to use re.search() instead of re.match(), so that it can better cope with warning messages.
C++: Support more complex 16-bit float types
This improves the implementation of the generated parent/child relationship by adding a new `all_children` field to `ql.Class` which lists all children (both direct and inherited) of a class, carefully avoiding duplicating children in case of diamond inheritance. This: * simplifies the generated code, * avoid children ambiguities in case of diamond inheritance. This only comes with some changes in the order of children in the generated tests (we were previously sorting bases alphabetically there). For the rest this should be a non-functional change.
Given that it's a non-path-problem dataflow query, the InlineExpectationsTest is not as useful.
The range `A-aa-z` was too permissive and includes special characters between `Z` and `a`. Low impact, but fix to address an internally reported code scanning alert.
…-regex QLDoc scripts: Fix overly permissive regex ranges
C++: Fix for the SQL query.
pick-kotlin-version.py: tolerate warnings
…OperationStep' mechanic.
C++: Handle explicitly instantiated templates
…ponent-length Ruby: Do not compute `StringlikeLiteralImpl.getStringValue` for large strings
…formatting Fix markdown query help formatting
…lude-always Rust: Assume prelude is always available in path resolution
…lap2 Rust: Apply inherent method prioritization inside type inference loop
Rust: add to `generate-code-scanning-query-list.py` and `shared-code-metrics.py` scripts
C++: Remove unused `external_package` tables from the dbscheme
Fixes in cpp/global-use-before-init
dilanbhalla
approved these changes
Jul 2, 2025
chanel-y
approved these changes
Jul 10, 2025
ropwareJB
added a commit
that referenced
this pull request
Jul 10, 2025
Revert #251, Reapply `codeql-cli/v2.22.1`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Manual merge upstream to
main.Four conflicts manually merged:
Conflicts were non-mututally exclusive: both changes accepted in all cases except in
rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll, whereby the Github version was preferred.