Skip to content

[Clang] Remove some dead code in getNumTeamsExprForTargetDirective #95695

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

Merged
merged 2 commits into from
Jul 25, 2024

Conversation

xgupta
Copy link
Contributor

@xgupta xgupta commented Jun 16, 2024

This was reported in https://pvs-studio.com/en/blog/posts/cpp/1126/, fragment N9.

V523 The 'then' statement is equivalent to the subsequent code fragment. CGOpenMPRuntime.cpp:6040, 6036

This was reported in https://pvs-studio.com/en/blog/posts/cpp/1126/, fragment N9.

V523 The 'then' statement is equivalent to the subsequent code fragment. CGOpenMPRuntime.cpp:6040, 6036
@llvmbot llvmbot added clang Clang issues not falling into any other category clang:codegen IR generation bugs: mangling, exceptions, etc. clang:openmp OpenMP related changes to Clang labels Jun 16, 2024
@llvmbot
Copy link
Member

llvmbot commented Jun 16, 2024

@llvm/pr-subscribers-clang-codegen

@llvm/pr-subscribers-clang

Author: Shivam Gupta (xgupta)

Changes

This was reported in https://pvs-studio.com/en/blog/posts/cpp/1126/, fragment N9.

V523 The 'then' statement is equivalent to the subsequent code fragment. CGOpenMPRuntime.cpp:6040, 6036


Full diff: https://github.com/llvm/llvm-project/pull/95695.diff

1 Files Affected:

  • (modified) clang/lib/CodeGen/CGOpenMPRuntime.cpp (-2)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index f6d12d46cfc07..0c99ee3b8c4a9 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -6037,8 +6037,6 @@ const Expr *CGOpenMPRuntime::getNumTeamsExprForTargetDirective(
         MinTeamsVal = MaxTeamsVal = 1;
         return nullptr;
       }
-      MinTeamsVal = MaxTeamsVal = 1;
-      return nullptr;
     }
     // A value of -1 is used to check if we need to emit no teams region
     MinTeamsVal = MaxTeamsVal = -1;

Copy link
Member

@alexey-bataev alexey-bataev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG

@xgupta xgupta merged commit 26b7070 into llvm:main Jul 25, 2024
7 checks passed
@xgupta xgupta deleted the pvs-n9 branch July 25, 2024 06:52
@llvm-ci
Copy link
Collaborator

llvm-ci commented Jul 25, 2024

LLVM Buildbot has detected a new failure on builder clang-x86_64-debian-fast running on gribozavr4 while building clang at step 6 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/56/builds/3353

Here is the relevant piece of the build log for the reference:

Step 6 (test-build-unified-tree-check-all) failure: test (failure)
******************** TEST 'Clang Tools :: clang-doc/basic-project.test' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
Emiting docs in html format.
Mapping decls...
Collecting infos...
Reducing 5 infos...
Generating docs...
Generating assets for docs...

--
Command Output (stderr):
--
RUN: at line 1: rm -rf /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp && mkdir -p /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build
+ rm -rf /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp
+ mkdir -p /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build
RUN: at line 2: sed 's|$test_dir|/b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc|g' /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/Inputs/basic-project/database_template.json > /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build/compile_commands.json
+ sed 's|$test_dir|/b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc|g' /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/Inputs/basic-project/database_template.json
RUN: at line 3: clang-doc --format=html --output=/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs --executor=all-TUs /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build/compile_commands.json
+ clang-doc --format=html --output=/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs --executor=all-TUs /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build/compile_commands.json
[1/3] Processing file /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/Inputs/basic-project/src/Rectangle.cpp
[2/3] Processing file /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/Inputs/basic-project/src/Circle.cpp
[3/3] Processing file /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/Inputs/basic-project/src/Calculator.cpp
RUN: at line 4: FileCheck /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/index_json.js -check-prefix=JSON-INDEX
+ FileCheck /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/index_json.js -check-prefix=JSON-INDEX
RUN: at line 5: FileCheck /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html -check-prefix=HTML-SHAPE
+ FileCheck /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html -check-prefix=HTML-SHAPE
/b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/basic-project.test:64:16: error: HTML-SHAPE: expected string not found in input
// HTML-SHAPE: <h3 id="{{([0-9A-F]{40})}}">area</h3>
               ^
/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html:27:53: note: scanning from here
 <p>Defined at line 13 of file ./include/Shape.h</p>
                                                    ^
/b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html:47:41: note: possible intended match here
 <a href="#12896F9255F880ECD4A6482CCFA58B238FA2CC49">area</a>
                                        ^

Input file: /b/1/clang-x86_64-debian-fast/llvm.obj/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html
Check file: /b/1/clang-x86_64-debian-fast/llvm.src/clang-tools-extra/test/clang-doc/basic-project.test

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            .
            .
            .
           22:  <div> 
...

@llvm-ci
Copy link
Collaborator

llvm-ci commented Jul 25, 2024

LLVM Buildbot has detected a new failure on builder clang-armv8-quick running on linaro-clang-armv8-quick while building clang at step 5 "ninja check 1".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/154/builds/1917

Here is the relevant piece of the build log for the reference:

Step 5 (ninja check 1) failure: stage 1 checked (failure)
******************** TEST 'Clang Tools :: clang-doc/basic-project.test' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
Emiting docs in html format.
Mapping decls...
Collecting infos...
Reducing 5 infos...
Generating docs...
Generating assets for docs...

--
Command Output (stderr):
--
RUN: at line 1: rm -rf /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp && mkdir -p /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build
+ rm -rf /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp
+ mkdir -p /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build
RUN: at line 2: sed 's|$test_dir|/home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc|g' /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/Inputs/basic-project/database_template.json > /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build/compile_commands.json
+ sed 's|$test_dir|/home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc|g' /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/Inputs/basic-project/database_template.json
RUN: at line 3: clang-doc --format=html --output=/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs --executor=all-TUs /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build/compile_commands.json
+ clang-doc --format=html --output=/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs --executor=all-TUs /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/build/compile_commands.json
[1/3] Processing file /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/Inputs/basic-project/src/Calculator.cpp
[2/3] Processing file /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/Inputs/basic-project/src/Circle.cpp
[3/3] Processing file /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/Inputs/basic-project/src/Rectangle.cpp
RUN: at line 4: FileCheck /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/index_json.js -check-prefix=JSON-INDEX
+ FileCheck /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/index_json.js -check-prefix=JSON-INDEX
RUN: at line 5: FileCheck /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html -check-prefix=HTML-SHAPE
+ FileCheck /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/basic-project.test -input-file=/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html -check-prefix=HTML-SHAPE
/home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/basic-project.test:64:16: error: HTML-SHAPE: expected string not found in input
// HTML-SHAPE: <h3 id="{{([0-9A-F]{40})}}">area</h3>
               ^
/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html:32:53: note: scanning from here
 <p>Defined at line 13 of file ./include/Shape.h</p>
                                                    ^
/home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html:47:41: note: possible intended match here
 <a href="#12896F9255F880ECD4A6482CCFA58B238FA2CC49">area</a>
                                        ^

Input file: /home/tcwg-buildbot/worker/clang-armv8-quick/stage1/tools/clang/tools/extra/test/clang-doc/Output/basic-project.test.tmp/docs/GlobalNamespace/Shape.html
Check file: /home/tcwg-buildbot/worker/clang-armv8-quick/llvm/clang-tools-extra/test/clang-doc/basic-project.test

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            .
            .
            .
           27:  <div> 
...

yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
…95695)

Summary:
This was reported in https://pvs-studio.com/en/blog/posts/cpp/1126/,
fragment N9.

V523 The 'then' statement is equivalent to the subsequent code fragment.
CGOpenMPRuntime.cpp:6040, 6036

---------

Co-authored-by: Shivam Gupta <[email protected]>

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60250549
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:codegen IR generation bugs: mangling, exceptions, etc. clang:openmp OpenMP related changes to Clang clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants