Skip to content

Merge branch 'master' into '6.0/stage' #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2021
Merged

Merge branch 'master' into '6.0/stage' #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df405cd
Fix regressions introduced by drgn's updated type equality
sdimitro Feb 3, 2021
6754f05
Merge pull request #254 from sdimitro/update_drgn_type_equality
sdimitro Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sdb/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ def massage_input_and_call(
return

# If we are passed a foo_t when we expect a foo_t*, use its address.
if target.get_pointer_type(first_obj_type) == expected_type:
if target.type_equals(target.get_pointer_type(first_obj_type),
expected_type):
yield from execute_pipeline(objs, [Address(), cmd])
return

Expand Down
2 changes: 1 addition & 1 deletion sdb/target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def type_equals(a: drgn.Type, b: drgn.Type) -> bool:
same because we usually just need to know, "is this a foo_t*", without
regard for which source .c file defined the foo_t.

Note that the drgn type equality operator (==) attempts to evalue deep
Note that the drgn type equality operator (==) attempts to evaluate deep
type equality and therefore doesn't complete in a reasonable amount of time.
"Deep type equality" means that two "struct foo"s that each contain a
"struct bar *member" are not necessarily equal, because we must recursively
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def create_struct_type(prog: drgn.Program, name: str, member_names: List[str],
struct_size, bit_offset = 0, 0
member_list = []
for member_name, type_ in zip(member_names, member_types):
member_type = drgn.TypeMember(type_, member_name, bit_offset, 0)
member_type = drgn.TypeMember(type_, member_name, bit_offset)
member_list.append(member_type)
if type_.kind == drgn.TypeKind.ARRAY:
bit_offset += 8 * type_.length * type_.type.size
Expand Down
20 changes: 10 additions & 10 deletions tests/unit/commands/test_address.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_single_object() -> None:

assert len(ret) == 1
assert ret[0].value_() == 0xffffffffc0000000
assert ret[0].type_ == MOCK_PROGRAM.type('int *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('int *'))


def test_plain_address() -> None:
Expand All @@ -47,7 +47,7 @@ def test_plain_address() -> None:

assert len(ret) == 1
assert ret[0].value_() == 0xffffffffc084eee0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))


def test_multiple_object() -> None:
Expand All @@ -57,11 +57,11 @@ def test_multiple_object() -> None:

assert len(ret) == 3
assert ret[0].value_() == 0xffffffffc0000000
assert ret[0].type_ == MOCK_PROGRAM.type('int *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('int *'))
assert ret[1].value_() == 0xffffffffc084eee0
assert ret[1].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('void *'))
assert ret[2].value_() == 0xffff88d26353c108
assert ret[2].type_ == MOCK_PROGRAM.type('void **')
assert sdb.type_equals(ret[2].type_, MOCK_PROGRAM.type('void **'))


def test_piped_invocations() -> None:
Expand All @@ -71,11 +71,11 @@ def test_piped_invocations() -> None:

assert len(ret) == 3
assert ret[0].value_() == 0xffffffffc0000000
assert ret[0].type_ == MOCK_PROGRAM.type('int *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('int *'))
assert ret[1].value_() == 0xffffffffc084eee0
assert ret[1].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('void *'))
assert ret[2].value_() == 0xffff88d26353c108
assert ret[2].type_ == MOCK_PROGRAM.type('void **')
assert sdb.type_equals(ret[2].type_, MOCK_PROGRAM.type('void **'))


def test_echo_pipe() -> None:
Expand All @@ -85,9 +85,9 @@ def test_echo_pipe() -> None:

assert len(ret) == 2
assert ret[0].value_() == 0xffffffffc084eee0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[1].value_() == 0xffff88d26353c108
assert ret[1].type_ == MOCK_PROGRAM.type('void **')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('void **'))


def test_global_not_found() -> None:
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/commands/test_cast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def test_invoke_pipe_input() -> None:
ret = invoke(MOCK_PROGRAM, objs, line)

assert len(ret) == 1
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[0].value_() == 0x01020304


Expand All @@ -63,7 +63,7 @@ def test_str_pipe_input() -> None:
ret = invoke(MOCK_PROGRAM, [], line)

assert len(ret) == 1
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[0].value_() == 0xffffffffc0000000


Expand All @@ -73,7 +73,7 @@ def test_pipe_input_pointer_to_int() -> None:
ret = invoke(MOCK_PROGRAM, [], line)

assert len(ret) == 1
assert ret[0].type_ == MOCK_PROGRAM.type('unsigned int')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('unsigned int'))
assert ret[0].value_() == 0xc0000000


Expand All @@ -92,7 +92,7 @@ def test_double_cast() -> None:
ret = invoke(MOCK_PROGRAM, [], line)

assert len(ret) == 1
assert ret[0].type_ == MOCK_PROGRAM.type('char *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('char *'))
assert ret[0].value_() == 0xc0000000


Expand All @@ -102,4 +102,4 @@ def test_pointer_to_struct() -> None:
with pytest.raises(sdb.CommandError) as err:
invoke(MOCK_PROGRAM, [], line)

assert "cannot convert 'int *' to 'struct test_struct'" in str(err.value)
assert "cannot cast to 'struct test_struct'" in str(err.value)
36 changes: 18 additions & 18 deletions tests/unit/commands/test_echo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_piped_input() -> None:

assert len(ret) == 1
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))


def test_single_arg_hex() -> None:
Expand All @@ -49,7 +49,7 @@ def test_single_arg_hex() -> None:

assert len(ret) == 1
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))


def test_single_arg_decimal() -> None:
Expand All @@ -59,7 +59,7 @@ def test_single_arg_decimal() -> None:

assert len(ret) == 1
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))


def test_bogus_arg() -> None:
Expand All @@ -79,7 +79,7 @@ def test_test_piped_int() -> None:

assert len(ret) == 1
assert ret[0].value_() == 1
assert ret[0].type_ == MOCK_PROGRAM.type('int')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('int'))


def test_single_arg() -> None:
Expand All @@ -89,7 +89,7 @@ def test_single_arg() -> None:

assert len(ret) == 1
assert ret[0].value_() == 1
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))


def test_multiple_piped() -> None:
Expand All @@ -103,9 +103,9 @@ def test_multiple_piped() -> None:

assert len(ret) == 2
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[1].value_() == 1
assert ret[1].type_ == MOCK_PROGRAM.type('int')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('int'))


def test_multiple_args() -> None:
Expand All @@ -115,9 +115,9 @@ def test_multiple_args() -> None:

assert len(ret) == 2
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[1].value_() == 1
assert ret[1].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('void *'))


def test_piped_and_args_combo() -> None:
Expand All @@ -131,13 +131,13 @@ def test_piped_and_args_combo() -> None:

assert len(ret) == 4
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[1].value_() == 1
assert ret[1].type_ == MOCK_PROGRAM.type('int')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('int'))
assert ret[2].value_() == 0
assert ret[2].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[2].type_, MOCK_PROGRAM.type('void *'))
assert ret[3].value_() == 1
assert ret[3].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[3].type_, MOCK_PROGRAM.type('void *'))


def test_multi_echo_combo() -> None:
Expand All @@ -151,12 +151,12 @@ def test_multi_echo_combo() -> None:

assert len(ret) == 5
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[1].value_() == 1
assert ret[1].type_ == MOCK_PROGRAM.type('int')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('int'))
assert ret[2].value_() == 2
assert ret[2].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[2].type_, MOCK_PROGRAM.type('void *'))
assert ret[3].value_() == 3
assert ret[3].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[3].type_, MOCK_PROGRAM.type('void *'))
assert ret[4].value_() == 4
assert ret[4].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[4].type_, MOCK_PROGRAM.type('void *'))
4 changes: 2 additions & 2 deletions tests/unit/commands/test_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ def test_multi_void_ptr_input_value_match_ne() -> None:

assert len(ret) == 2
assert ret[0].value_() == 0
assert ret[0].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[0].type_, MOCK_PROGRAM.type('void *'))
assert ret[1].value_() == 2
assert ret[1].type_ == MOCK_PROGRAM.type('void *')
assert sdb.type_equals(ret[1].type_, MOCK_PROGRAM.type('void *'))


def test_char_array_input_object_match() -> None:
Expand Down