Commit 7b672917 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r315578: 

------------------------------------------------------------------------
r315578 | abataev | 2017-10-12 06:51:32 -0700 (Thu, 12 Oct 2017) | 7 lines

[OPENMP] Fix PR34925: Fix getting thread_id lvalue for inlined regions
in C.

If we try to get the lvalue for thread_id variables in inlined regions,
we did not use the correct version of function. Fixed this bug by adding
overrided version of the function getThreadIDVariableLValue for inlined
regions.
------------------------------------------------------------------------

llvm-svn: 318315
parent 6fd15753

clang/lib/CodeGen/CGOpenMPRuntime.cpp

+7 −0
Original line number Diff line number Diff line
@@ -264,6 +264,13 @@ public: 
    return nullptr;

  }



  /// \brief Get an LValue for the current ThreadID variable.

  LValue getThreadIDVariableLValue(CodeGenFunction &CGF) override {

    if (OuterRegionInfo)

      return OuterRegionInfo->getThreadIDVariableLValue(CGF);

    llvm_unreachable("No LValue for inlined OpenMP construct");

  }



  /// \brief Get the name of the capture helper.

  StringRef getHelperName() const override {

    if (auto *OuterRegionInfo = getOldCSI())

clang/test/OpenMP/task_codegen.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -x c -emit-llvm %s -o - | FileCheck %s

// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10 -emit-pch -o %t %s

// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s

// expected-no-diagnostics

#ifndef HEADER

#define HEADER



void foo();



// CHECK-LABEL: @main

int main() {

  // CHECK: call i32 @__kmpc_global_thread_num(

  // CHECK: call i8* @__kmpc_omp_task_alloc(

  // CHECK: call i32 @__kmpc_omp_task(

#pragma omp task

  {

#pragma omp taskgroup

    {

#pragma omp task

      foo();

    }

  }

  // CHECK: ret i32 0

  return 0;

}

// CHECK: call void @__kmpc_taskgroup(

// CHECK: call i8* @__kmpc_omp_task_alloc(

// CHECK: call i32 @__kmpc_omp_task(

// CHECK: call void @__kmpc_end_taskgroup(

#endif