Skip to content
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.

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

Fix ChipError scope resolution #9627

Merged
merged 1 commit into from
Sep 13, 2021

Conversation

mspang
Copy link
Contributor

@mspang mspang commented Sep 13, 2021

Problem

The CHIP error macros result in compile errors in contexts where the 'chip' identifier resolve to the wrong namespace.

Change overview

Use qualified name lookup for chip namespace in error macros.

Testing

Compile.

Make sure to unambiguously specify the chip namespace in macros
as they can be evaluated in places where 'chip::' is ambiguous.
@github-actions
Copy link

Size increase report for "esp32-example-build" from e945d16

File Section File VM
chip-lock-app.elf .flash.text 60 60
chip-shell.elf .flash.text 43 48
chip-ipv6only-app.elf .flash.text 172 172
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-lock-app.elf and ./pull_artifact/chip-lock-app.elf:

sections,vmsize,filesize
.flash.text,60,60
.debug_line,0,4
.debug_loc,0,-4
.xt.lit._ZNK4chip4SpanIhE7SubSpanEjj,0,-8
.xt.prop._ZNK4chip4SpanIhE7SubSpanEjj,0,-12
[Unmapped],0,-60

Comparing ./master_artifact/chip-shell.elf and ./pull_artifact/chip-shell.elf:

sections,vmsize,filesize
[Unmapped],0,4053
.flash.text,48,43

Comparing ./master_artifact/chip-all-clusters-app.elf and ./pull_artifact/chip-all-clusters-app.elf:

sections,vmsize,filesize
.riscv.attributes,0,1
.debug_line,0,-1

Comparing ./master_artifact/chip-pigweed-app.elf and ./pull_artifact/chip-pigweed-app.elf:

sections,vmsize,filesize

Comparing ./master_artifact/chip-persistent-storage.elf and ./pull_artifact/chip-persistent-storage.elf:

sections,vmsize,filesize
.debug_line,0,1
.debug_str,0,-1

Comparing ./master_artifact/chip-bridge-app.elf and ./pull_artifact/chip-bridge-app.elf:

sections,vmsize,filesize
.debug_line,0,5
.debug_str,0,-1

Comparing ./master_artifact/chip-temperature-measurement-app.elf and ./pull_artifact/chip-temperature-measurement-app.elf:

sections,vmsize,filesize
.debug_line,0,4

Comparing ./master_artifact/chip-ipv6only-app.elf and ./pull_artifact/chip-ipv6only-app.elf:

sections,vmsize,filesize
[Unmapped],0,3924
.flash.text,172,172


@andy31415 andy31415 merged commit 5c864e4 into project-chip:master Sep 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants