From e6d1592492a3a379186bfb02bd0f4eda0669c0d5 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 20 Aug 2019 20:50:12 +0000 Subject: Vendor import of stripped llvm trunk r366426 (just before the release_90 branch point): https://llvm.org/svn/llvm-project/llvm/trunk@366426 --- lib/Target/AMDGPU/SIModeRegister.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/Target/AMDGPU/SIModeRegister.cpp') diff --git a/lib/Target/AMDGPU/SIModeRegister.cpp b/lib/Target/AMDGPU/SIModeRegister.cpp index 883fd308f2f4..a5edd7b3554a 100644 --- a/lib/Target/AMDGPU/SIModeRegister.cpp +++ b/lib/Target/AMDGPU/SIModeRegister.cpp @@ -1,9 +1,8 @@ //===-- SIModeRegister.cpp - Mode Register --------------------------------===// // -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// /// \file @@ -45,7 +44,7 @@ struct Status { Status() : Mask(0), Mode(0){}; - Status(unsigned Mask, unsigned Mode) : Mask(Mask), Mode(Mode) { + Status(unsigned NewMask, unsigned NewMode) : Mask(NewMask), Mode(NewMode) { Mode &= Mask; }; -- cgit v1.3