From 2a2440bb81bf35127302b513664e49d6932b1b4e Mon Sep 17 00:00:00 2001 From: Pat Gavlin Date: Wed, 16 Nov 2016 13:35:06 -0800 Subject: [PATCH] Format code. Commit migrated from https://github.com/dotnet/coreclr/commit/0ccd73a224b9d474986bd02feaa45db1d95280d7 --- src/coreclr/src/jit/emitxarch.cpp | 3 ++- src/coreclr/src/jit/morph.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/coreclr/src/jit/emitxarch.cpp b/src/coreclr/src/jit/emitxarch.cpp index 700eeec..f9fd898 100644 --- a/src/coreclr/src/jit/emitxarch.cpp +++ b/src/coreclr/src/jit/emitxarch.cpp @@ -2915,7 +2915,8 @@ regNumber emitter::emitInsBinary(instruction ins, emitAttr attr, GenTree* dst, G if (varNum != BAD_VAR_NUM || tmpDsc != nullptr) { // Is the memory op in the source position? - if (src->isContainedLclField() || src->isContainedLclVar() || src->isContainedSpillTemp() || src->isContainedMemoryOp()) + if (src->isContainedLclField() || src->isContainedLclVar() || src->isContainedSpillTemp() || + src->isContainedMemoryOp()) { if (instrHasImplicitRegPairDest(ins)) { diff --git a/src/coreclr/src/jit/morph.cpp b/src/coreclr/src/jit/morph.cpp index 859bf45..65bb9f8 100644 --- a/src/coreclr/src/jit/morph.cpp +++ b/src/coreclr/src/jit/morph.cpp @@ -12760,12 +12760,13 @@ GenTreePtr Compiler::fgMorphSmpOp(GenTreePtr tree, MorphAddrContext* mac) { assert(temp->OperIsLocal()); - const unsigned lclNum = temp->AsLclVarCommon()->gtLclNum; - LclVarDsc* const varDsc = &lvaTable[lclNum]; + const unsigned lclNum = temp->AsLclVarCommon()->gtLclNum; + LclVarDsc* const varDsc = &lvaTable[lclNum]; - const var_types tempTyp = temp->TypeGet(); - const bool useExactSize = varTypeIsStruct(tempTyp) || (tempTyp == TYP_BLK) || (tempTyp == TYP_LCLBLK); - const unsigned varSize = useExactSize ? varDsc->lvExactSize : genTypeSize(temp); + const var_types tempTyp = temp->TypeGet(); + const bool useExactSize = + varTypeIsStruct(tempTyp) || (tempTyp == TYP_BLK) || (tempTyp == TYP_LCLBLK); + const unsigned varSize = useExactSize ? varDsc->lvExactSize : genTypeSize(temp); // If the size of the load is greater than the size of the lclVar, we cannot fold this access into // a lclFld: the access represented by an lclFld node must begin at or after the start of the -- 2.7.4