Jonas Jensen 5f0d283212 Merge remote-tracking branch 'upstream/master' into dataflow-indirect-args ...

The conflicts came from how `this` is now a parameter but not a
`Parameter` on `master`.

Conflicts:
	cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
	cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/defaulttainttracking.cpp
	cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/tainted.expected
	cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/test_diff.expected
	cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
	cpp/ql/test/library-tests/dataflow/fields/ir-flow.expected
	cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected

2020-06-02 15:35:02 +02:00

..

defaulttainttracking.cpp

Merge remote-tracking branch 'upstream/master' into dataflow-indirect-args

2020-06-02 15:35:02 +02:00

dispatch.cpp

C++: Fix struct field conflation in IR data flow

2020-05-18 16:24:22 +02:00

global.expected

C++: Move identical declarations to shared.h file

2020-05-18 10:42:52 +02:00

global.ql

C++: Add tests for global-var support

2020-02-05 16:31:13 +01:00

globals.cpp

C++: Move identical declarations to shared.h file

2020-05-18 10:42:52 +02:00

shared.h

C++: Move identical declarations to shared.h file

2020-05-18 10:42:52 +02:00

tainted.expected

Merge remote-tracking branch 'upstream/master' into dataflow-indirect-args

2020-06-02 15:35:02 +02:00

tainted.ql

C++: Test IR taint through library functions

2020-01-21 12:03:43 +01:00

test_diff.cpp

C++: Move identical declarations to shared.h file

2020-05-18 10:42:52 +02:00

test_diff.expected

Merge remote-tracking branch 'upstream/master' into dataflow-indirect-args

2020-06-02 15:35:02 +02:00

test_diff.ql

C++: Always use the old library for the diff test

2020-01-29 16:03:35 +01:00