Skip to content

Revert "[clang] Mark ContentCache as invalid if !Buffer:"#12454

Closed
hahnjo wants to merge 1 commit intoroot-project:masterfrom
hahnjo:revert-cache-invalid
Closed

Revert "[clang] Mark ContentCache as invalid if !Buffer:"#12454
hahnjo wants to merge 1 commit intoroot-project:masterfrom
hahnjo:revert-cache-invalid

Conversation

@hahnjo
Copy link
Copy Markdown
Member

@hahnjo hahnjo commented Mar 8, 2023

This reverts commit 8deb57c and fixes the Cling test CodeUnloading/Macros.C that was previously failing with complaints that the unloaded and then re-included Macros.h header had no lines 18 and 19.

@hahnjo
Revert "[clang] Mark ContentCache as invalid if !Buffer:"
c1ab2a7 
This reverts commit 8deb57c and fixes
the Cling test CodeUnloading/Macros.C that was previously failing with
complaints that the unloaded and then re-included Macros.h header had
no lines 18 and 19.
@hahnjo hahnjo added the in:Cling label Mar 8, 2023
@hahnjo hahnjo requested a review from Axel-Naumann March 8, 2023 13:29
@hahnjo hahnjo self-assigned this Mar 8, 2023
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Mar 8, 2023

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac12/noimt, mac11/cxx14, windows10/cxx14
How to customize builds

@hahnjo
Copy link
Copy Markdown
Member Author

hahnjo commented Mar 8, 2023

@Axel-Naumann this was done during the huge upgrade PR to LLVM 13, do you remember which problem it was supposed to address? The commit message is somewhat scarce on details...

(the llvm-diff workflow will fail, but I won't attempt to update the monorepo before Axel is done with syncing it to the current state in ROOT)

@Axel-Naumann
Copy link
Copy Markdown
Member

Axel-Naumann commented May 16, 2023

I don't remember in which case we call setBuffer(nullptr) - that's the case that the original commit tried to address. I still find it consistent with the ctor (!buffer and IsBufferInvalid == true); the original setBuffer() basically assumes that the argument is always a valid buffer.

@hahnjo
Copy link
Copy Markdown
Member Author

hahnjo commented May 19, 2023

Javier is fixing the test in #12855 by moving the diagnostics checks to the re-included header.

@hahnjo hahnjo closed this May 19, 2023
@hahnjo hahnjo deleted the revert-cache-invalid branch May 19, 2023 14:34
@hahnjo hahnjo mentioned this pull request May 19, 2023
Merged
2 tasks
jalopezg-git added a commit to jalopezg-git/root that referenced this pull request May 19, 2023
@jalopezg-git
[cling] Fix CodeUnloading/Macros.C test
cc4dcce 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c, but is not to be reverted
per discussion in root-project#12454.
jalopezg-git added a commit to jalopezg-git/root that referenced this pull request May 19, 2023
@jalopezg-git
[cling] Fix CodeUnloading/Macros.C test
32a1aae 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c, but is not to be reverted
per discussion in root-project#12454.
jalopezg-git added a commit that referenced this pull request May 19, 2023
@jalopezg-git
[cling] Fix CodeUnloading/Macros.C test
8b30d9e 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c, but is not to be reverted
per discussion in #12454.
jalopezg-git added a commit that referenced this pull request May 19, 2023
@jalopezg-git
[cling] Fix CodeUnloading/Macros.C test
47ddb5b 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c, but is not to be reverted
per discussion in #12454.
FonsRademakers pushed a commit to root-project/cling that referenced this pull request May 19, 2023
@jalopezg-git
Fix CodeUnloading/Macros.C test
e635331 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c04a5ceea96533d095092fcd4f71d1df94, but is not to be reverted
per discussion in root-project/root#12454.
enirolf pushed a commit to enirolf/root that referenced this pull request May 26, 2023
@jalopezg-git @enirolf
[cling] Fix CodeUnloading/Macros.C test
b4ab983 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c, but is not to be reverted
per discussion in root-project#12454.
maksgraczyk pushed a commit to maksgraczyk/root that referenced this pull request Jun 28, 2023
@jalopezg-git @maksgraczyk
[cling] Fix CodeUnloading/Macros.C test
32ef1eb 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c, but is not to be reverted
per discussion in root-project#12454.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Axel-Naumann Axel-Naumann Awaiting requested review from Axel-Naumann

@dpiparo dpiparo Awaiting requested review from dpiparo dpiparo will be requested when the pull request is marked ready for review dpiparo is a code owner

Assignees

@hahnjo hahnjo

Labels

in:Cling

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hahnjo @phsft-bot @Axel-Naumann